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

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -55,14 +55,14 @@
         <el-button size="small" icon="el-icon-printer" @click="toDialog" type="primary">设置</el-button>
         <el-button size="small" icon="el-icon-printer" @click="toSign" type="primary">标签打印</el-button>
         <el-button size="small" icon="el-icon-printer" @click="printAction" type="primary">标签打印设置</el-button>
-        
+
         <el-button size="small"  @click="exportList" type="primary">导出</el-button>
         <el-button size="small"  @click="toPrint" icon="el-icon-printer" type="primary">打印</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
-        
+
       </div>
     </div>
-  
+
     <div>
       <el-table
         :data="list"
@@ -156,7 +156,7 @@
          <el-table-column align="center" label="透前血压"  v-if="dialysisSett.blood_pressure==1">
            <template slot-scope="scope">
             <span v-if="scope.row.assessment_befor_dislysis.systolic_blood_pressure>0">{{scope.row.assessment_befor_dislysis.systolic_blood_pressure}}</span>
-            <span v-if="scope.row.assessment_befor_dislysis.diastolic_blood_pressure>0">/{{scope.row.assessment_befor_dislysis.diastolic_blood_pressure}}</span> 
+            <span v-if="scope.row.assessment_befor_dislysis.diastolic_blood_pressure>0">/{{scope.row.assessment_befor_dislysis.diastolic_blood_pressure}}</span>
            </template>
         </el-table-column>
          <el-table-column align="center" label="目标脱水量"  v-if="dialysisSett.ultrafiltration_volume==1">
@@ -178,7 +178,7 @@
              <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi > 0">({{scope.row.dialysis_prescription.anticoagulant_weichi}})</span>
 
              <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang == 0">({{scope.row.dialysis_solution.anticoagulant_zongliang}})</span>
-             
+
              <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang > 0">({{scope.row.dialysis_prescription.anticoagulant_zongliang}})</span>
            </template>
         </el-table-column>
@@ -219,14 +219,14 @@
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="滤过器"  v-if="dialysisSett.dialysis_irrigation ==1">
+        <el-table-column align="center" label="滤过器"  v-if="dialysisSett.dialysis_strainer_set ==1">
            <template slot-scope="scope">
              <span v-if="scope.row.dialysis_prescription.dialysis_strainer!=''">{{scope.row.dialysis_prescription.dialysis_strainer}}</span>
              <span v-if="scope.row.dialysis_prescription.dialysis_strainer==''">{{scope.row.dialysis_solution.dialysis_strainer}}</span>
            </template>
         </el-table-column>
-        
-        
+
+
         <el-table-column align="center" label="置换液" v-if="dialysisSett.displace_liqui_part==1">
            <template slot-scope="scope">
              <span>{{getDisplaceLiquiPart(scope.row.dialysis_solution.displace_liqui_part)}}</span>
@@ -238,7 +238,7 @@
              <span v-if="scope.row.dialysis_solution.displace_liqui_value>0">{{scope.row.dialysis_solution.displace_liqui_value}}</span>
            </template>
         </el-table-column>
-       
+
 
         <el-table-column align="center" label="钾"  v-if="dialysisSett.kalium==1">
            <template slot-scope="scope">
@@ -314,16 +314,16 @@
               {{ scope.row.advice_spc_five }}
            </template>
         </el-table-column>
-      
+
         <el-table-column align="center" label="葡萄糖"  v-if="dialysisSett.glucose==1">
            <template slot-scope="scope">
-             <span>{{scope.row.dialysis_solution.amylaceum?scope.row.dialysis_solution.amylaceum:""}} </span> 
+             <span>{{scope.row.dialysis_solution.amylaceum?scope.row.dialysis_solution.amylaceum:""}} </span>
            </template>
         </el-table-column>
 
        <el-table-column align="center" label="血流量"  v-if="dialysisSett.blood_flow_volume==1">
            <template slot-scope="scope">
-             <span>{{scope.row.dialysis_solution.blood_flow_volume?scope.row.dialysis_solution.blood_flow_volume:""}} </span> 
+             <span>{{scope.row.dialysis_solution.blood_flow_volume?scope.row.dialysis_solution.blood_flow_volume:""}} </span>
            </template>
         </el-table-column>
       </el-table>
@@ -348,9 +348,10 @@
            <el-checkbox v-model="sealing_fluid_dispose" label="封管液"></el-checkbox>
            <el-checkbox v-model="mode_id" label="透析模式"></el-checkbox>
            <el-checkbox v-model="dialysis_time" label="透析时长"></el-checkbox>
-         
+
            <el-checkbox v-model="dialysis_dialyszers" label="透析器"></el-checkbox>
            <el-checkbox v-model="dialysis_irrigation" label="灌流器"></el-checkbox>
+             <el-checkbox v-model="dialysis_strainer" label="滤过器"></el-checkbox>
            <el-checkbox v-model="kalium" label="钾"></el-checkbox>
            <el-checkbox v-model="displace_liqui_value" label="置换液总量"></el-checkbox>
            <el-checkbox v-model="bicarbonate" label="碳酸氢根"></el-checkbox>
@@ -470,7 +471,7 @@
            </el-select>
            <el-button size="small" @click="toPrintOne" icon="el-icon-printer" type="primary">打印</el-button>
            <el-button size="small"  @click="exportListOne" type="primary">导出</el-button>
-        </div> 
+        </div>
        <el-table
         :data="tableList"
         border
@@ -495,14 +496,14 @@
              {{scope.row.specification_name}}
            </template>
         </el-table-column>
-       
+
         <el-table-column  align="center"   label="数量">
            <template slot-scope="scope">
             {{scope.row.count}}
            </template>
         </el-table-column>
-        
-     
+
+
 
       </el-table>
       </span>
@@ -525,7 +526,7 @@ import dialysis from '../../../../router/modules/dialysis';
   const moment = require('moment')
   export default {
     components: {
-      
+
     },
     data() {
       return {
@@ -630,6 +631,7 @@ import dialysis from '../../../../router/modules/dialysis';
         gansuna:false,
         zhetangtie:false,
         niaojimei:false,
+        dialysis_strainer:false,
         displace_liqui_part_option:[],
         ids:"",
         form: {
@@ -656,17 +658,17 @@ import dialysis from '../../../../router/modules/dialysis';
         partition_id:0,
         zoneList:[],
         org_id:0,
-       
+
       }
     },
     open(){
-     
+
     },
     created() {
       this.org_id = this.$store.getters.xt_user.org.id
        this.blood_access_option  = getDataConfig('hemodialysis', 'vascular_access_desc')
        this.displace_liqui_part_option = this.$store.getters.displace_liqui
-    
+
        var filedList = store.getters.xt_user.fileds
        var newArr = [
         {value:999999,filed_name_cn:"姓名"},
@@ -696,14 +698,14 @@ import dialysis from '../../../../router/modules/dialysis';
       this.query.partition_id = 0
       this.query.page = 1
       this.getAllZone()
-     
-     
-     
+
+
+
     },
     methods: {
       getlist(){
-      
-        
+
+
         var str = ""
          if(this.partition_id==0){
             str = this.zoneList.join(",")
@@ -713,21 +715,21 @@ import dialysis from '../../../../router/modules/dialysis';
            str = this.partition_id.join(",")
          }
          this.query.partition_id = ""
-         this.query.partition_id = str 
-      
+         this.query.partition_id = str
+
         getDialysisParameter(this.query).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
-              
+
               if(list!=null &&list.length>0){
                 for(let i=0;i<list.length;i++){
                   list[i].sort = 0
                   list[i].sort = list[i].device_number.sort
                 }
-      
+
               }
               list.sort(this.compare('sort'))
-            
+
 
               for(let i=0;i<list.length;i++){
                 list[i].advice_spc =""
@@ -758,7 +760,7 @@ import dialysis from '../../../../router/modules/dialysis';
                         list[i].advice_spc_five+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
                      }
                  }
-                
+
               }
               console.log("listwowowowowowo日本",this.list)
               this.list = list
@@ -766,7 +768,7 @@ import dialysis from '../../../../router/modules/dialysis';
               this.dialysisSett = response.data.data.dialysisSett
               // console.log("设置",this.dialysisSett)
             }
-        }) 
+        })
       },
       compare(p) { //这是比较函数
         return function (m, n) {
@@ -822,7 +824,7 @@ import dialysis from '../../../../router/modules/dialysis';
         //   return ""
         // }
       },
-   
+
       selectSchedulType(scheduleType) {
         this.schedulType = scheduleType
         this.query.schedule_type = scheduleType
@@ -849,48 +851,48 @@ import dialysis from '../../../../router/modules/dialysis';
             this.$message.error(response.data.msg)
             return false
           } else {
-           
+
 
             for(let i=0;i<response.data.data.zone.length;i++){
                this.partitionArrOne.push(response.data.data.zone[i])
                this.zoneList.push(response.data.data.zone[i].id)
             }
             this.partitionArr = response.data.data.zone
-           
+
             console.log("全部中",this.partitionArrOne)
             this.partitionArr.unshift({ id: 0, name: '全部' })
             this.getlist()
-            
+
           }
         })
       },
       statistics() {
          this.tableList = []
-       
+
          var params = {
           schedule_type:this.schedule_type,
           partion_type:this.partitionType,
           selected_date:this.query.schedule_date,
         }
-    
+
         var timeStamp = Date.parse(this.query.schedule_date)
-       
+
         var arrDateOne = (timeStamp/1000) -28800
-        console.log("时间搓",arrDateOne) 
+        console.log("时间搓",arrDateOne)
         let dateone =  moment().format('YYYY-MM-DD')//获取标准时间 //Tue Aug 16 2022 15:06:24 GMT+0800 (中国标准时间)
         //方式一
         let timeStampOne = Date.parse(dateone)
-        
+
         var arrDateTwo = (timeStampOne/1000)-28800
 
         console.log("时间搓2222",arrDateTwo)
-     
+
         getDialysisParameterGoodList(params).then(response=>{
            if(response.data.state == 1){
             this.startdialogVisible = true
             var list = response.data.data.list
             var anticoagulantList = []
-            
+
             if(arrDateOne > arrDateTwo){
               console.log("简单阿凡达2332322332")
               if(list!=null && list.length>0){
@@ -912,7 +914,7 @@ import dialysis from '../../../../router/modules/dialysis';
                         list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
                     }
 
-                    
+
                     if(list[i].dialysis_solution.anticoagulant == 1){
                         anticoagulantList.push(list[i].dialysis_solution)
                     }
@@ -979,7 +981,7 @@ import dialysis from '../../../../router/modules/dialysis';
                         list[i].dialysis_strainer_arr = list[i].dialysis_prescription.dialysis_strainer.split(",")
                     }
 
-                    
+
                     if(list[i].dialysis_prescription.anticoagulant == 1){
                         anticoagulantList.push(list[i].dialysis_prescription)
                     }
@@ -1026,12 +1028,12 @@ import dialysis from '../../../../router/modules/dialysis';
             // var NewAllList=[]
             // for(let i=0;i<list.length;i++){
             //    if(list[i].dialysis_machine_name =="OCI150"){
-            //         NewAllList.push(list[i]) 
+            //         NewAllList.push(list[i])
             //    }
             // }
             // console.log("NewAllList",NewAllList)
-          
-         
+
+
            this.tableList = []
            if(anticoagulantList!=null && anticoagulantList.length > 0){
                 let dataInfoOne = {}
@@ -1071,7 +1073,7 @@ import dialysis from '../../../../router/modules/dialysis';
             var dialysisStrainerArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
-               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
+               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])
              }
              for(let z=0;z<list[i].dialyzer_perfusion_apparatus_arr.length;z++){
               dialyzerPerfusionApparaArr.push(list[i].dialyzer_perfusion_apparatus_arr[z])
@@ -1104,15 +1106,15 @@ import dialysis from '../../../../router/modules/dialysis';
               a.specification_name = i
               Arr.push(a);
             }
-          
+
            for(let i=0;i<dialyzerPerfusionApparaArr.length;i++){
             if(objOne[dialyzerPerfusionApparaArr[i]]){
                 objOne[dialyzerPerfusionApparaArr[i]] +=1
              }else{
               objOne[dialyzerPerfusionApparaArr[i]] = 1
-             }   
+             }
            }
-           
+
            for (let i in objOne) {
               let a = {};
               a[i] = objOne[i];
@@ -1122,14 +1124,14 @@ import dialysis from '../../../../router/modules/dialysis';
               Arr.push(a);
             }
 
-         
+
 
            for(let i=0;i<dialysisIrrigationArr.length;i++){
             if(objTwo[dialysisIrrigationArr[i]]){
               objTwo[dialysisIrrigationArr[i]] +=1
              }else{
               objTwo[dialysisIrrigationArr[i]] = 1
-             }   
+             }
            }
 
            for (let i in objTwo) {
@@ -1156,7 +1158,7 @@ import dialysis from '../../../../router/modules/dialysis';
               objThree[dialysisStrainerArr[i]] +=1
              }else{
               objThree[dialysisStrainerArr[i]] = 1
-             }   
+             }
            }
 
            for (let i in objThree) {
@@ -1178,7 +1180,7 @@ import dialysis from '../../../../router/modules/dialysis';
         })
       },
 
-    
+
       getModeName(id){
          var mode_name =""
          if(id == 1){
@@ -1257,7 +1259,7 @@ import dialysis from '../../../../router/modules/dialysis';
          if(id ==42){
            mode_name ="HD."
          }
-        
+
          return mode_name
       },
       getAnticoagulantName(id){
@@ -1291,7 +1293,7 @@ import dialysis from '../../../../router/modules/dialysis';
 
        exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-      
+
          if(this.list!=null && this.list.length > 0){
             console.log("hhhahhah",this.list)
             for(let i=0;i<this.list.length;i++){
@@ -1308,8 +1310,8 @@ import dialysis from '../../../../router/modules/dialysis';
                 this.list[i].blood_pressure = ""
               }
               this.list[i].ultrafiltration_volume = this.list[i].dialysis_solution.target_ultrafiltration?this.list[i].dialysis_solution.target_ultrafiltration:""
-             
-              
+
+
               this.list[i].anticoagulant_one=""
               if(this.list[i].dialysis_prescription.anticoagulant == ''){
                 this.list[i].anticoagulant_one = (this.getAnticoagualnt(this.list[i].dialysis_solution.anticoagulant)) + "(" + (this.list[i].dialysis_solution.anticoagulant_shouji) +")" + "("+(this.list[i].dialysis_solution.anticoagulant_weichi) +")"+"("+(this.list[i].dialysis_solution.anticoagulant_zongliang)+")"
@@ -1318,8 +1320,8 @@ import dialysis from '../../../../router/modules/dialysis';
               if(this.list[i].dialysis_prescription.anticoagulant != ''){
                 this.list[i].anticoagulant_one = (this.getAnticoagualnt(this.list[i].dialysis_prescription.anticoagulant)) + "(" + (this.list[i].dialysis_prescription.anticoagulant_shouji) +")" + "("+(this.list[i].dialysis_prescription.anticoagulant_weichi) +")"+"("+(this.list[i].dialysis_prescription.anticoagulant_zongliang)+")"
               }
-             
-             
+
+
               this.list[i].dialysis_time = this.list[i].dialysis_solution.dialysis_duration_hour?this.list[i].dialysis_solution.dialysis_duration_hour:"" + "时"+ this.list[i].dialysis_solution.dialysis_duration_minute?this.list[i].dialysis_solution.dialysis_duration_minute:"" + "分"
               if(this.list[i].dialysis_time == 0){
                this.list[i].dialysis_time = ""
@@ -1340,7 +1342,7 @@ import dialysis from '../../../../router/modules/dialysis';
               if(this.list[i].dialysis_prescription.dialysis_irrigation != ""){
                 this.list[i].dialysis_irrigation = this.list[i].dialysis_prescription.dialysis_irrigation
               }
-             
+
               if(this.list[i].dialysis_prescription.displace_liqui_part==""){
                 this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_solution.displace_liqui_part)
               }
@@ -1348,8 +1350,8 @@ import dialysis from '../../../../router/modules/dialysis';
               if(this.list[i].dialysis_prescription.displace_liqui_part!=""){
                 this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_prescription.displace_liqui_part)
               }
-            
-           
+
+
               this.list[i].displace_liqui_value = this.list[i].dialysis_solution.displace_liqui_value? this.list[i].dialysis_solution.displace_liqui_value:""
               this.list[i].kalium = this.list[i].dialysis_solution.kalium?this.list[i].dialysis_solution.kalium:""
               this.list[i].sodium = this.list[i].dialysis_solution.sodium?this.list[i].dialysis_solution.sodium:""
@@ -1367,7 +1369,7 @@ import dialysis from '../../../../router/modules/dialysis';
          }
 
          console.log("list23323232322323wode",this.list)
-         
+
          var arr= []
          var arrTwo = []
          arr.push('序号')
@@ -1417,7 +1419,7 @@ import dialysis from '../../../../router/modules/dialysis';
          if(this.dialysisSett.device_type == 1){
            arr.push("设备型号")
            arrTwo.push("device_type")
-         } 
+         }
          if(this.dialysisSett.dialyzer_perfusion_apparatus == 1){
             arr.push("透析器/灌流器")
             arrTwo.push("dialyzer_perfusion_apparatus")
@@ -1472,19 +1474,19 @@ import dialysis from '../../../../router/modules/dialysis';
            arr.push("血流量")
            arrTwo.push("blood_flow_volume")
         }
-         
+
         arr.push("封管液")
         arrTwo.push("count")
 
         arr.push("促红")
         arrTwo.push("advice_spc")
-       
+
         const tHeader = arr
         const filterVal = arrTwo
-        
+
         const data = this.formatJson(filterVal, this.list)
         console.log("DATWOWOWOWO",data)
-       
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -1497,7 +1499,7 @@ import dialysis from '../../../../router/modules/dialysis';
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
       exportListOne(){
-        import('@/vendor/Export2Excel').then(excel => { 
+        import('@/vendor/Export2Excel').then(excel => {
         if(this.tableList!=null && this.tableList.length > 0){
            for(let i=0;i<this.tableList.length;i++){
              this.tableList[i].index = i+1
@@ -1513,7 +1515,7 @@ import dialysis from '../../../../router/modules/dialysis';
            filename: '透析参数统计'
          })
           this.downloadLoading = false
-        })  
+        })
       },
      toDialog(){
       getDialysisSetting().then(response=>{
@@ -1608,6 +1610,13 @@ import dialysis from '../../../../router/modules/dialysis';
               this.dialysis_irrigation = false
             }
 
+            if(dialysisSett.dialysis_strainer_set == 1){
+               this.dialysis_strainer_set = true
+            } 
+            if(dialysisSett.dialysis_strainer_set == 2){
+               this.dialysis_strainer_set = false
+            } 
+
             if(dialysisSett.gaijiliang ==1){
               this.gaijiliang =true
             }else{
@@ -1697,13 +1706,13 @@ import dialysis from '../../../../router/modules/dialysis';
 
 
           }
-     
+
         }
       })
-      
+
      },
      saveDialysisSetting(){
-       var device_number_set = 0 
+       var device_number_set = 0
        var device_type_set = 0
        var name_set = 0
        var admission_number_set = 0
@@ -1720,6 +1729,7 @@ import dialysis from '../../../../router/modules/dialysis';
        var dialysis_time_set =0
        var dialysis_dialyszers_set =0
        var dialysis_irrigation_set =0
+       var dialysis_strainer_set = 0
        var gaijiliang_set = 0
        var kalium_set = 0
        var displace_liqui_value_set =0
@@ -1730,7 +1740,7 @@ import dialysis from '../../../../router/modules/dialysis';
        var blood_access_set =0
        var dialyzer_perfusion_apparatus_set =0
        var displace_liqui_part_set =0
-        
+
        var cuhong_set = 0
        var zuoka_set =0
        var difenzi_set =0
@@ -1755,7 +1765,7 @@ import dialysis from '../../../../router/modules/dialysis';
        if(this.difenzi == false){
           difenzi_set = 2
        }
-       
+
        if(this.difenzi == true){
           difenzi_set = 1
        }
@@ -1780,7 +1790,7 @@ import dialysis from '../../../../router/modules/dialysis';
        if(this.niaojimei == true){
           niaojimei_set = 1
        }
-      
+
        if(this.sodium == false){
          sodium_set = 2
        }
@@ -1812,11 +1822,11 @@ import dialysis from '../../../../router/modules/dialysis';
        if(this.displace_liqui_part == false){
           displace_liqui_part_set = 2
        }
-       
+
        if(this.displace_liqui_part == true){
           displace_liqui_part_set = 1
        }
-    
+
 
        if(this.device_number == false){
           device_number_set = 2
@@ -1850,7 +1860,7 @@ import dialysis from '../../../../router/modules/dialysis';
         }
         if(this.weight_befor == false){
            weight_befor_set = 2
-        } 
+        }
         if(this.weight_befor == true){
            weight_befor_set = 1
         }
@@ -1859,7 +1869,7 @@ import dialysis from '../../../../router/modules/dialysis';
         }
         if(this.dry_weight == true){
            dry_weight_set = 1
-        }   
+        }
         if(this.blood_pressure == false){
           blood_pressure_set = 2
         }
@@ -1920,6 +1930,16 @@ import dialysis from '../../../../router/modules/dialysis';
         if(this.dialysis_irrigation == true){
            dialysis_irrigation_set = 1
         }
+
+        if(this.dialysis_strainer == false){
+          dialysis_strainer_set = 2
+        }
+
+        if(this.dialysis_strainer == true){
+          dialysis_strainer_set = 1
+        }
+
+
         if(this.gaijiliang == false){
           this.gaijiliang = 2
         }
@@ -1984,8 +2004,9 @@ import dialysis from '../../../../router/modules/dialysis';
           gansuna_set:gansuna_set,
           zhetangtie_set:zhetangtie_set,
           niaojimei_set:niaojimei_set,
+          dialysis_strainer_set:dialysis_strainer_set,
         }
-       
+
        saveDialysisSetting(params).then(response=>{
          if(response.data.state == 1){
            var dialysisSetting = response.data.data.dialysisSetting
@@ -2137,9 +2158,9 @@ import dialysis from '../../../../router/modules/dialysis';
           }
         })
       },
-    
+
       saveRemindPrint() {
-       
+
 
         if (this.perfusion_apparatus == true) {
           // console.log('3333')
@@ -2248,13 +2269,13 @@ import dialysis from '../../../../router/modules/dialysis';
         this.$router.push({path:"/dialysis/consumable/dialysis/count/print?schedule_type="+this.schedule_type+"&partion_type="+this.partion_type+"&schedule_date="+this.query.schedule_date})
       },
       handleSelectionChange(val){
-        
+
         var arr = []
         for(let i=0;i<val.length;i++){
           arr.push(val[i].id)
         }
         this.ids = arr.join(",")
-     }, 
+     },
      changeScheduleType(){
       this.tableList = []
       this.statistics()

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -41,7 +41,7 @@
                 <td width="100" v-if="dialysisSett.dialyzer_perfusion_apparatus == 1">透析器/灌流器</td>
                 <td width="100"  v-if="dialysisSett.dialysis_dialyszers == 1">透析器</td>
                 <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">灌流器</td>
-                <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">滤过器</td>
+                <td width="100" v-if="dialysisSett.dialysis_strainer_set ==1">滤过器</td>
                  <td width="100" v-if="dialysisSett.displace_liqui_part==1">置换液</td>
                 <td width="100"  v-if="dialysisSett.displace_liqui_value==1">置换液总量</td>
                 <td width="100" v-if="dialysisSett.kalium==1">钾</td>

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

@@ -953,7 +953,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441)"
+                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10721)"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(ml)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id!=26">
                             <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
@@ -964,7 +964,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53 && this.$store.getters.xt_user.template_info.org_id != 10206) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
+                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53 && this.$store.getters.xt_user.template_info.org_id != 10206) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10721"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26"
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>

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

@@ -392,14 +392,14 @@
             "
           >
             <template slot-scope="scope">
-             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612 || org_id ==10617 || org_id ==10702">
+             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612 || org_id ==10617 || org_id ==10702 || org_id == 10644">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : "0"
               }}
               </span>
-               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612 && org_id!=10617 && org_id!=10702">
+               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612 && org_id!=10617 && org_id!=10702 && org_id!=10644">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
@@ -763,7 +763,7 @@
               {{
                 scope.row.displacement_quantity
                   ? scope.row.displacement_quantity
-                  : ""
+                  : "0"
               }}
             </template>
           </el-table-column>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -94,8 +94,8 @@
           <td v-if="isShow('跨膜压')"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
           <td v-if="isShow('跨膜压1')"> {{ monitor.transmembrane_pressure_one ? monitor.transmembrane_pressure_one : "/" }} </td>
           <td v-if="isShow('超滤量')"> 
-            <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10702">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
-            <span v-if="org_id ==9671 || org_id==10440 || org_id == 10702">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
+            <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10702 && org_id!=10644">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
+            <span v-if="org_id ==9671 || org_id==10440 || org_id == 10702 || org_id == 10644">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
           </td>
           <td v-if="isShow('超滤量1')"> 
             {{ monitor.ultrafiltration_volume_one ? monitor.ultrafiltration_volume_one : "/" }}

src/xt_pages/dialysis/doctorAdvicePrintOne.vue

@@ -206,6 +206,8 @@ export default {
             showOne:false,
             delivery_way:"",
             org_id:0,
+            schedule_type:0,
+            partition_type:0
         }
     },
     methods:{
@@ -245,6 +247,8 @@ export default {
             patient_type: 0,
             advice_type: 2,
             delivery_way:this.delivery_way,
+            schedule_type:this.schedule_type,
+            partition_type:this.partition_type,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
@@ -742,6 +746,8 @@ export default {
       var time = this.$route.query.time
       var delivery_way = this.$route.query.delivery_way
       this.delivery_way = delivery_way
+      this.schedule_type = this.$route.query.schedulType
+      this.partition_type = this.$route.query.partitionType
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)

src/xt_pages/dialysis/doctorAdvicePrintTwo.vue

@@ -82,7 +82,9 @@ export default {
             showOne:false,
             delivery_way:"",
             org_id:0,
-            drugList:[]
+            drugList:[],
+            schedule_type:0,
+            partition_type:0,
         }
     },
     methods:{
@@ -122,6 +124,8 @@ export default {
             patient_type: 0,
             advice_type: 2,
             delivery_way:this.delivery_way,
+            schedule_type:this.schedule_type,
+            partition_type:this.partition_type,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
@@ -299,6 +303,8 @@ export default {
       var time = this.$route.query.time
       var delivery_way = this.$route.query.delivery_way
       this.delivery_way = delivery_way
+      this.schedule_type = this.$route.query.schedulType
+      this.partition_type = this.$route.query.partitionType
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -41,7 +41,7 @@
             </template>
             </el-autocomplete>
             <el-button type="primary" @click="toSeach">搜索</el-button>
-            
+
             <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
             <el-button type="primary" @click="toSeachOne">搜索</el-button>
           </div>
@@ -56,7 +56,7 @@
             <el-button type="primary" size="small" @click="toStaticFour">耗材月统计</el-button>
           </div>
         </div>
-        
+
       </div>
       <!-- <div class="filter-container">
         <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
@@ -528,7 +528,7 @@
         <div class="eldialog" style="margin-bottom:10px">
           <div>
             <label class="title"> <span class="name">排班班次</span> : </label>
-            <el-select v-model="schedule_type" placeholder="请选择" 
+            <el-select v-model="schedule_type" placeholder="请选择"
               @change="changeScheduleType"  style="width: 120px;">
               <el-option
                 v-for="item in schedulArr"
@@ -538,7 +538,7 @@
               </el-option>
             </el-select>
             <label class="title"> <span class="name">病区选择</span> : </label>
-            <el-select v-model="partion_type" placeholder="请选择" 
+            <el-select v-model="partion_type" placeholder="请选择"
                   @change="changePartionType" multiple  style="width: 120px;"
               >
               <el-option
@@ -586,7 +586,7 @@
              <span v-if="config.is_open ==1">{{getHisCount(scope.row.child,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
            </template>
         </el-table-column>
-      
+
         <el-table-column align="center" label="厂家">
            <template slot-scope="scope">
              {{scope.row.manufacturer_name}}
@@ -622,7 +622,7 @@
               </el-option>
             </el-select>
             <label class="title"> <span class="name">病区选择</span> : </label>
-            <el-select v-model="partion_type" placeholder="请选择" 
+            <el-select v-model="partion_type" placeholder="请选择"
               @change="changePartionTypeOne" multiple style="width: 120px;">
               <el-option
                 v-for="item in partitionArr"
@@ -748,7 +748,7 @@
         <div class="eldialog" style="margin-bottom:10px">
           <div>
             <label class="title"> <span class="name">排班班次</span> : </label>
-            <el-select v-model="schedule_type" placeholder="请选择" 
+            <el-select v-model="schedule_type" placeholder="请选择"
               @change="changeScheduleTypeTwo" style="width: 120px;">
               <el-option
                 v-for="item in schedulArr"
@@ -758,7 +758,7 @@
               </el-option>
             </el-select>
             <label class="title"> <span class="name">病区选择</span> : </label>
-            <el-select v-model="partion_type" placeholder="请选择" 
+            <el-select v-model="partion_type" placeholder="请选择"
               @change="changePartionTypeTwo" multiple  style="width: 120px;">
               <el-option
                 v-for="item in partitionArr"
@@ -820,7 +820,7 @@
         <div class="eldialog" style="margin-bottom:10px">
           <div>
             <label class="title"> <span class="name">日期查询</span> : </label>
-            
+
               <el-date-picker
                 v-model="start_time"
                 prefix-icon="el-icon-date"
@@ -831,7 +831,7 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
-              
+
             ></el-date-picker>
               <span>-</span>
               <el-date-picker
@@ -844,7 +844,7 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
-              
+
             ></el-date-picker>
           </div>
           <div>
@@ -852,10 +852,10 @@
             <el-button size="small" icon="el-icon-printer"  @click="toPrintTen" type="primary">打印</el-button>
             <el-button size="small"  @click="toExportListThree" type="primary">导出</el-button>
           </div>
-          
-           
+
+
         </div>
-     
+
         <el-table
           :data="tableMonthList"
           border
@@ -887,7 +887,7 @@
               <span v-if="config.is_open ==1">{{getHisCount(scope.row.child,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
             </template>
           </el-table-column>
-        
+
           <el-table-column align="center" label="厂家">
             <template slot-scope="scope">
               {{scope.row.manufacturer_name}}
@@ -921,7 +921,7 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
-              
+
             ></el-date-picker>
               <span>-</span>
               <el-date-picker
@@ -934,7 +934,7 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
-              
+
             ></el-date-picker>
           </div>
 
@@ -1547,14 +1547,14 @@ export default {
        }
 
        if(this.org_id == 9671 || this.org_id == 10340){
-        this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
+        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){
-         this.$router.push({ path: "/dialysis/doctorAdvicePrint/two",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
+         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){
+       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0 && 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} });
        }
 
@@ -2162,8 +2162,8 @@ export default {
                 this.tableList = []
                 this.tableList = hisarr
               }
-                
-               
+
+
               }
 
 
@@ -2384,7 +2384,7 @@ export default {
             this.manufacturerList = manufacturerList
             var adviceMonthList = response.data.data.adviceList
             var hisAdviceMonthList = response.data.data.hisAdviceList
-        
+
             for(let i=0;i<hisAdviceMonthList.length;i++){
                 hisAdviceMonthList[i].count_one = 0
                if(hisAdviceMonthList[i].prescribing_number_unit == hisAdviceMonthList[i].drug.max_unit){
@@ -2393,11 +2393,11 @@ export default {
                }
             }
 
-  
+
             if(config.is_open == 1){
 
 
-               
+
               if(hisAdviceMonthList!=null && hisAdviceMonthList.length>0){
                 let dataInfo = {}
                 hisAdviceMonthList.forEach((item, index) => {
@@ -2433,9 +2433,9 @@ export default {
             }
 
             if(config.is_open == 2 || config.is_open ==0){
-             
+
               if(adviceMonthList!=null && adviceMonthList.length>0){
-                 
+
                 if(adviceMonthList!=null && adviceMonthList.length > 0){
                   let dataInfo = {}
                   adviceMonthList.forEach((item, index) => {
@@ -2483,7 +2483,7 @@ export default {
             console.log("projectMonthList",projectMonthList)
 
             if(projectMonthList!=null && projectMonthList.length>0){
-              
+
               let dataInfo = {}
               projectMonthList.forEach((item, index) => {
               let { project_id } = item
@@ -3077,7 +3077,7 @@ export default {
         return manufacturer_name
     },
     getDrugName(drug_id,drugs){
-      
+
       var drug_name = ""
       for(let i=0;i<drugs.length;i++){
          if(drug_id == drugs[i].id){
@@ -3093,7 +3093,7 @@ export default {
           manufacturer = drugs[i].manufacturer
          }
       }
-   
+
       var  manufacturer_name = ""
         for(let i=0;i<manufacturerList.length;i++){
             if(manufacturer== manufacturerList[i].id){

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2011,7 +2011,7 @@
                             {{
                               monitor.displacement_quantity
                                 ? monitor.displacement_quantity
-                                : ""
+                                : "0"
                             }}
                             </span>
                             <span v-if="org_id == 10683">

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -641,10 +641,22 @@
                       <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="">
                         <td height="40px">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
                         <td >{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
-                        <td >{{monitor.replacement_rate ? monitor.replacement_rate : '/'}}</td>
-                        <td >{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</td>
-                        <td >{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</td>
-                        <td >{{ monitor.venous_pressure ? monitor.venous_pressure : "/"}}</td>
+                        <td>
+                          <span v-if="monitor.systolic_blood_pressure>0">{{monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span> 
+                          <span v-if="monitor.systolic_blood_pressure == 0">{{monitor.replacement_rate ? monitor.replacement_rate : ''}}</span> 
+                        </td>
+                        <td >
+                         <span v-if="monitor.systolic_blood_pressure>0">{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</span> 
+                         <span v-if="monitor.systolic_blood_pressure ==0">{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '' }}</span>
+                        </td>
+                        <td >
+                          <span v-if="monitor.systolic_blood_pressure>0"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                          <span v-if="monitor.systolic_blood_pressure==0"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                        </td>
+                        <td >
+                          <span v-if="monitor.systolic_blood_pressure>0"> {{ monitor.venous_pressure ? monitor.venous_pressure : "/"}}</span>
+                          <span v-if="monitor.systolic_blood_pressure==0"> {{ monitor.venous_pressure ? monitor.venous_pressure : ""}}</span>
+                        </td>
                         <td>{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ""}}</td>
                         <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
                         <!-- 温度 -->
@@ -1832,7 +1844,8 @@ export default {
             }
           }
         })
-      } if(this.monitors.length >0){
+      } 
+      if(this.monitors.length >0){
         for(let i in this.monitors){
           if(this.monitors[i].blood_flow_volume ==0){
             const obj55 = '监测第'+((i*1)+1)+'行血流量'
@@ -1879,6 +1892,8 @@ export default {
 
         }
       }
+      
+
       if(monearr.length>0){
        checkDate =checkDate.concat(monearr)
         console.log('1111',checkDate.concat(monearr));
@@ -2184,16 +2199,16 @@ export default {
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;
 
-        if (this.monitors.length <= 3) {
-          var nl = 3;
-          this.print_length = 3;
+        if (this.monitors.length <= 7) {
+          var nl = 7;
+          this.print_length = 7;
 
           for (let index = 0; index < nl; index++) {
             if (
               this.monitors[index] == undefined ||
               this.monitors[index].length <= 0
             ) {
-              this.monitors2.push([]);
+              this.monitors.push([]);
             } else {
               continue;
             }

src/xt_pages/role/admin.vue

@@ -32,7 +32,7 @@
           style="float:left"
           @click="toJiaBan">首拼</el-button>  -->
 
-          
+
 
 
           <!-- <el-button
@@ -227,12 +227,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <!-- <el-button
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> -->
+          @click="toAutoDiagnose">自动脚本</el-button>
 
         <!-- <el-button
           type="primary"
@@ -250,7 +250,7 @@
           @click="toCheckQuery">库存检验脚本</el-button> -->
 
 
-        
+
      </div>
 
 
@@ -1222,7 +1222,7 @@ export default {
     },
     toAutoDiagnose(){
       toAutoDiagnose().then(response=>{
-        
+
       })
     },
     toJiaoYou(){

src/xt_pages/user/patients.vue

@@ -253,6 +253,22 @@
           </ul>
         </div>
       </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">患者类型</span> : </label>
+        <div class="time ">
+          <ul class="">
+            <li
+              :class="item.value == patientType ? 'active' : ''"
+              @click="selectPatientType(item.value)"
+              v-for="item in patienttypeList"
+              :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
       <!-- <div class="cell clearfix">
         <label class="title"><span class="name">患者去向</span> : </label>
         <div class="time ">
@@ -825,6 +841,7 @@
           { value: 2, label: '未绑定' }
         ],
         sourceType: 0,
+        patientType:0,
         patientSoureType:0,
         sourceID: 0,
         lapsetoType: 1,
@@ -836,6 +853,7 @@
           { value: 2, label: '住院', source: 2, lapseto: 1 },
           { value: 3, label: '门特', source: 3, lapseto: 1 }
         ],
+        patienttypeList: [{value:0,label:"全部"},{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
         patientSourceList:[
           {value:0,label:"全部",source:0,lapeseto:0},
           {value:1,label:"门诊",source:1,lapeseto:1},
@@ -900,6 +918,7 @@
           isprescription: '',
           patientSoureType:'',
           nurse:0,
+          patient_type:"",
         },
         multipleSelection: [],
         bindWechatDialog: false,
@@ -1573,6 +1592,12 @@
         this.getList()
         this.getExportList()
       },
+      selectPatientType(patient_type){
+        this.patientType = patient_type
+        this.listQuery.patient_type = patient_type
+        this.getList()
+        this.getExportList()
+      },
       selectPatientSource(source){
         this.patientSoureType = source
         this.listQuery.patientSoureType = source

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))