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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13748"
+  "version": "2999.999.13737"
 }

src/pages/main/beforeDialysis/components/dialysisParameters.vue

@@ -45,6 +45,7 @@
             </el-table-column>
             <el-table-column prop="address" label="抗凝剂(首剂)(维持)(总量)" width="120" align="center">
                 <template slot-scope="scope">
+                  <span v-if="getAnticoagulant(scope.row.patient_id)!=''">
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 0"></span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 1">无肝素</span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 2">普通肝素</span>
@@ -57,7 +58,8 @@
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 9">达肝素</span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 10">体外抗凝</span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 11">那屈肝素</span>
-                     <span v-if="getAnticoagulant(scope.row.patient_id) == 12">无抗凝剂</span>
+                    <span v-if="getAnticoagulant(scope.row.patient_id) == 12">无抗凝剂</span>
+
                     <span>
                       {{getAnticoagulantShouji(scope.row.patient_id)?getAnticoagulantShouji(scope.row.patient_id):''}}
                       <span v-if="getAnticoagulant(scope.row.patient_id) ==1 && getAnticoagulantShouji(scope.row.patient_id)!=''">mg)</span>
@@ -97,30 +99,56 @@
                       <span v-if="getAnticoagulant(scope.row.patient_id) == 9 && getAnticoagulantZongliang(scope.row.patient_id)!=''">iu/h)</span>
                       <span v-if="getAnticoagulant(scope.row.patient_id) == 10 && getAnticoagulantZongliang(scope.row.patient_id)!=''">mg)</span>
                     </span>
+                  </span>
+
+                  <span v-if="getAnticoagulant(scope.row.patient_id)==''">
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 1">无肝素</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 2">普通肝素</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 3">低分子肝素</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 4">阿加曲班</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 5">枸橼酸钠</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 6">低分子肝素钙</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 7">低分子肝素钠</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 8">依诺肝素</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 9">达肝素</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 10">体外抗凝</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 11">那屈肝素</span>
+                       <span v-if="scope.row.dialysis_solution.anticoagulant == 12">无抗凝剂</span>
+                       （{{scope.row.dialysis_solution.anticoagulant_shouji}}iu) 
+                       （{{scope.row.dialysis_solution.anticoagulant_weichi}} iu/h)
+                       （{{scope.row.dialysis_solution.anticoagulant_zongliang}} iu)
+                  </span>
+                  
+                  
                 </template>
             </el-table-column>
-             <el-table-column prop="address" label="透析器/灌流器" width="100" align="center">
+             <el-table-column prop="address" label="透析器/灌流器" width="100" align="center" v-if="org_id!=10721">
                 <template slot-scope="scope">
-                   {{getDialyzerPerfusionApparatus(scope.row.patient_id)?getDialyzerPerfusionApparatus(scope.row.patient_id):""}}
+                    {{getDialyzerPerfusionApparatus(scope.row.patient_id)?getDialyzerPerfusionApparatus(scope.row.patient_id):""}}
+
                 </template>
              </el-table-column>
 
              <el-table-column prop="address" label="透析器" width="100" align="center">
                 <template slot-scope="scope">
-                   {{getDialyzerPerfusionApparatusOne(scope.row.patient_id)?getDialyzerPerfusionApparatusOne(scope.row.patient_id):""}}
+                   <span v-if="getDialyzerPerfusionApparatusOne(scope.row.patient_id)!=''"> {{getDialyzerPerfusionApparatusOne(scope.row.patient_id)?getDialyzerPerfusionApparatusOne(scope.row.patient_id):""}}</span>
+                   <span v-if="getDialyzerPerfusionApparatusOne(scope.row.patient_id) ==''"> {{scope.row.dialysis_solution.dialysis_dialyszers}}</span>
                 </template>
              </el-table-column>
 
              <el-table-column prop="address" label="灌流器" width="100" align="center">
                 <template slot-scope="scope">
-                   {{getDialyzerPerfusionApparatusTwo(scope.row.patient_id)?getDialyzerPerfusionApparatusTwo(scope.row.patient_id):""}}
+                  <span v-if="getDialyzerPerfusionApparatusTwo(scope.row.patient_id)!=''"> {{getDialyzerPerfusionApparatusTwo(scope.row.patient_id)?getDialyzerPerfusionApparatusTwo(scope.row.patient_id):""}}</span>
+                  <span v-if="getDialyzerPerfusionApparatusTwo(scope.row.patient_id) ==''">{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
                 </template>
              </el-table-column>
 
              
              <el-table-column prop="address" label="滤过器" width="100" align="center">
                 <template slot-scope="scope">
-                   {{getDialyzerPerfusionApparatusThree(scope.row.patient_id)?getDialyzerPerfusionApparatusThree(scope.row.patient_id):""}}
+                  <span v-if="getDialyzerPerfusionApparatusThree(scope.row.patient_id)!=''">{{getDialyzerPerfusionApparatusThree(scope.row.patient_id)?getDialyzerPerfusionApparatusThree(scope.row.patient_id):""}}</span> 
+
+                  <span v-if="getDialyzerPerfusionApparatusThree(scope.row.patient_id)==''">{{ scope.row.dialysis_solution.dialysis_strainer }}</span> 
                 </template>
              </el-table-column>
 
@@ -163,10 +191,12 @@ export default {
       dialysisbefor: [],
       isStop: false,
       loading: true,
-      datalist: []
+      datalist: [],
+      org_id:0,
     }
   },
   created () {
+     this.org_id = this.$store.getters.user.template_info.org_id
     this.tableHeight = (document.documentElement.clientHeight - (Number(document.documentElement.style.fontSize.slice(0, -2)) * 4)) + 'px'
     // 获取透析参数统计表
     this.getlist()
@@ -288,7 +318,57 @@ export default {
             if (patient[i].mode_id == 28) {
               patient[i].mode_id = 'CVVHDF'
             }
+            if (patient[i].mode_id == 29) {
+              patient[i].mode_id = 'PE'
+            }
+            if (patient[i].mode_id == 30) {
+              patient[i].mode_id = '血浆胆红素吸附+HP'
+            }
+            if (patient[i].mode_id == 31) {
+              patient[i].mode_id = 'HPD'
+            }
+            if (patient[i].mode_id == 32) {
+              patient[i].mode_id = 'HDP'
+            }
+            if (patient[i].mode_id == 33) {
+              patient[i].mode_id = 'HFD'
+            }
+            if (patient[i].mode_id == 34) {
+              patient[i].mode_id = 'HDF100'
+            }
+            if (patient[i].mode_id == 35) {
+              patient[i].mode_id = 'HDF600'
+            }
+            if (patient[i].mode_id == 36) {
+              patient[i].mode_id = 'HDF800'
+            }
+            if (patient[i].mode_id == 37) {
+              patient[i].mode_id = 'HDF1000'
+            }
+            if (patient[i].mode_id == 38) {
+              patient[i].mode_id = 'HDF80'
+            }
+            if (patient[i].mode_id == 39) {
+              patient[i].mode_id = 'HF16'
+            }
+            if (patient[i].mode_id == 40) {
+              patient[i].mode_id = 'HD(无肝素)'
+            }
+            if (patient[i].mode_id == 41) {
+              patient[i].mode_id = 'HDF17H'
+            }
+            if (patient[i].mode_id == 42) {
+              patient[i].mode_id = 'HD.'
+            }
+            if (patient[i].mode_id == 43) {
+              patient[i].mode_id = 'HD(2)'
+            }
+            if (patient[i].mode_id == 44) {
+              patient[i].mode_id = '导管溶栓'
+            }
+            this.datalist = []
             this.datalist = patient
+            this.tableData = []
             this.tableData = patient
             this.$nextTick(() => {
               this.$refs.tab.doLayout()
@@ -305,152 +385,197 @@ export default {
     },
     getLastWeight (id) {
       var lastweight = ''
-      for (let i = 0; i < this.dialysisBefor.length; i++) {
-        if (this.dialysisBefor[i].patient_id == id) {
-          lastweight = this.dialysisBefor[i].weight_after_last_transparency
+      if(this.dialysisBefor!=undefined || this.dialysisBefor!=null ){
+        for (let i = 0; i < this.dialysisBefor.length; i++) {
+          if (this.dialysisBefor[i].patient_id == id) {
+            lastweight = this.dialysisBefor[i].weight_after_last_transparency
+          }
         }
       }
+     
       return lastweight
     },
     getLastbloodAccessPartentid(id){
        var blood_access_part_id  = ""
-       for (let i = 0; i < this.dialysisBefor.length; i++) {
-        if (this.dialysisBefor[i].patient_id == id) {
+       if(this.dialysisBefor!=undefined ||  this.dialysisBefor!=null){
+        for (let i = 0; i < this.dialysisBefor.length; i++) {
+         if (this.dialysisBefor[i].patient_id == id) {
           blood_access_part_id = this.dialysisBefor[i].blood_access_part_id
-        }
+         }
 
-        return blood_access_part_id
+        }
+       }
+       return blood_access_part_id
 
-      }
     },
     getLastbloodAccesspartOperaId(id){
       var blood_access_part_id  = ""
-       for (let i = 0; i < this.dialysisBefor.length; i++) {
+      if(this.dialysisBefor!=undefined && this.dialysisBefor!=null){
+        for (let i = 0; i < this.dialysisBefor.length; i++) {
         if (this.dialysisBefor[i].patient_id == id) {
           blood_access_part_id = this.getBloodAccess(this.dialysisBefor[i].blood_access_part_opera_id)
         }
-
-        return blood_access_part_id
-
+       }
       }
-     
+       
+      return blood_access_part_id
+
     },
     getWeightBefor (id) {
-      var assessmentBeforWeight = ''
-      for (let i = 0; i < this.dialysisBefor.length; i++) {
-        if (this.dialysisBefor[i].patient_id == id) {
-          assessmentBeforWeight = this.dialysisBefor[i].weight_before
+      if(this.dialysisBefor!=undefined && this.dialysisBefor!=null){
+        var assessmentBeforWeight = ''
+        for (let i = 0; i < this.dialysisBefor.length; i++) {
+          if (this.dialysisBefor[i].patient_id == id) {
+            assessmentBeforWeight = this.dialysisBefor[i].weight_before
+          }
         }
       }
+      
       return assessmentBeforWeight
     },
     getDryWeight (id) {
       var dryWeight = ''
-      for (let i = 0; i < this.dialysisBefor.length; i++) {
-        if (this.dialysisBefor[i].patient_id == id) {
-          dryWeight = this.dialysisBefor[i].dry_weight
+      if(this.dialysisBefor!=undefined && this.dialysisBefor!=null){
+        for (let i = 0; i < this.dialysisBefor.length; i++) {
+          if (this.dialysisBefor[i].patient_id == id) {
+            dryWeight = this.dialysisBefor[i].dry_weight
+          }
         }
       }
+     
       return dryWeight
     },
     getSysBloodPressure (id) {
       var sysBloodPressure = ''
-      for (let i = 0; i < this.dialysisBefor.length; i++) {
+      if(this.dialysisBefor!=undefined || this.dialysisBefor!=null){
+        for (let i = 0; i < this.dialysisBefor.length; i++) {
         if (this.dialysisBefor[i].patient_id == id) {
           sysBloodPressure = this.dialysisBefor[i].systolic_blood_pressure
         }
+       }
       }
+      
       return sysBloodPressure
     },
     getTargetUltrafiltration (id) {
       var targetUltrafiltration = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
-        if (this.prescriptionList[i].patient_id == id) {
-          targetUltrafiltration = this.prescriptionList[i].target_ultrafiltration
-        }
+      if(this.prescriptionList!=undefined || this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
+          if (this.prescriptionList[i].patient_id == id) {
+            targetUltrafiltration = this.prescriptionList[i].target_ultrafiltration
+          }
+       }
       }
+     
       return targetUltrafiltration
     },
     getBloodFlowVolume (id) {
       var bloodFlowVolume = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
+      if(this.prescriptionList!=undefined && this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
         if (this.prescriptionList[i].patient_id == id) {
           bloodFlowVolume = this.prescriptionList[i].blood_flow_volume
         }
+       }
       }
+    
       return bloodFlowVolume
     },
     getDialyzerPerfusionApparatus (id) {
       var dialyzerPerfusionApparatus = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
-        if (this.prescriptionList[i].patient_id == id) {
-          dialyzerPerfusionApparatus = this.prescriptionList[i].dialyzer_perfusion_apparatus
+      if(this.prescriptionList!=undefined && this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
+          if (this.prescriptionList[i].patient_id == id) {
+            dialyzerPerfusionApparatus = this.prescriptionList[i].dialyzer_perfusion_apparatus
+          }
         }
       }
+   
       return dialyzerPerfusionApparatus
     },
     getDialyzerPerfusionApparatusOne(id){
       var dialyzerPerfusionApparatus = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
-        if (this.prescriptionList[i].patient_id == id) {
-          dialyzerPerfusionApparatus = this.prescriptionList[i].dialysis_dialyszers
-        }
+      if(this.prescriptionList!=undefined || this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
+          if (this.prescriptionList[i].patient_id == id) {
+            dialyzerPerfusionApparatus = this.prescriptionList[i].dialysis_dialyszers
+          }
+       }
       }
+     
       return dialyzerPerfusionApparatus
     },
     getDialyzerPerfusionApparatusTwo(id){
       var dialyzerPerfusionApparatus = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
+      if(this.prescriptionList!=undefined || this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
         if (this.prescriptionList[i].patient_id == id) {
           dialyzerPerfusionApparatus = this.prescriptionList[i].dialysis_irrigation
         }
+       }
       }
+     
       return dialyzerPerfusionApparatus
     },
     getDialyzerPerfusionApparatusThree(id){
    
       var dialyzerPerfusionApparatus = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
-        if (this.prescriptionList[i].patient_id == id) {
-          dialyzerPerfusionApparatus = this.prescriptionList[i].dialysis_strainer
+      if(this.prescriptionList!=undefined || this.prescriptionList!=null ){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
+          if (this.prescriptionList[i].patient_id == id) {
+            dialyzerPerfusionApparatus = this.prescriptionList[i].dialysis_strainer
+          }
         }
       }
+    
       return dialyzerPerfusionApparatus
     },
     getAnticoagulant (id) {
       var anticoagulant = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
-        if (this.prescriptionList[i].patient_id == id) {
-          anticoagulant = this.prescriptionList[i].anticoagulant
-        }
+      if(this.prescriptionList!=undefined || this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
+          if (this.prescriptionList[i].patient_id == id) {
+            anticoagulant = this.prescriptionList[i].anticoagulant
+          }
+       }
       }
+     
       return anticoagulant
     },
     getAnticoagulantShouji (id) {
       var shouji = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
-        if (this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_shouji != 0) {
-          shouji = '(' + this.prescriptionList[i].anticoagulant_shouji
-        }
+      if(this.prescriptionList!=undefined || this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
+          if (this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_shouji != 0) {
+            shouji = '(' + this.prescriptionList[i].anticoagulant_shouji
+          }
+       }
       }
+      
       return shouji
     },
     getAnticoagulantWeichi (id) {
       var weichi = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
+      if(this.prescriptionList!=undefined || this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
         if (this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_weichi != 0) {
           weichi = '(' + this.prescriptionList[i].anticoagulant_weichi
         }
-        return weichi
+       
+       }
       }
+      return weichi
     },
     getAnticoagulantZongliang (id) {
       var zongliang = ''
-      for (let i = 0; i < this.prescriptionList.length; i++) {
+      if(this.prescriptionList!=undefined || this.prescriptionList!=null){
+        for (let i = 0; i < this.prescriptionList.length; i++) {
         if (this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_zongliang != 0) {
           zongliang = '(' + this.prescriptionList[i].anticoagulant_zongliang
         }
+       }
       }
+     
       return zongliang
     },
 

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -2136,11 +2136,11 @@ export default {
               this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
             }
           }else if(this.$store.getters.user.template_info.org_id == 10721){
-            if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
+            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(2)
             }
            
-            if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
+            if(this.dialysisPrescription.prescription_water<=0 || this.dialysisPrescription.prescription_water==""){
               this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
             }
           }else{
@@ -2177,10 +2177,10 @@ export default {
     }else{
       if(this.$store.getters.user.template_info.org_id == 10702 ||  this.$store.getters.user.template_info.org_id == 10635 || this.$store.getters.user.template_info.org_id==10721){
         console.log("康桥this.dialysisPrescription",this.dialysisPrescription.prescription_water)
-        if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
+        if(this.dialysisPrescription.prescription_water<=0 || this.dialysisPrescription.prescription_water==""){
             this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
           }
-        if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
+        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(2)
         }
       }

src/pages/main/newActionBar/monitoring.vue

@@ -132,9 +132,9 @@
                     <span v-if="org_id==10644">{{item.transmembrane_pressure?item.transmembrane_pressure:''}}</span>
                   </td>
                   <td v-if="isShow('跨膜压1')" >{{item.transmembrane_pressure_one?item.transmembrane_pressure_one:'/'}}</td>
-                  <td v-if="isShow('超滤量') && (org_id==10551 || org_id ==10617 || org_id ==10629 || org_id ==10679 || org_id ==10693 || org_id ==10702 || org_id ==10721)" >
+                  <td v-if="isShow('超滤量') && (org_id==10551 || org_id ==10617 || org_id ==10629 || org_id ==10679 || org_id ==10693 || org_id ==10702 || org_id ==10721 || org_id ==10644)" >
                     {{item.ultrafiltration_volume?item.ultrafiltration_volume:'0'}}</td>
-                  <td v-if="isShow('超滤量') && org_id!=10551 && org_id != 10617 && org_id!=10629 && org_id!=10679 && org_id!=10693 && org_id!=10702" >
+                  <td v-if="isShow('超滤量') && org_id!=10551 && org_id != 10617 && org_id!=10629 && org_id!=10679 && org_id!=10693 && org_id!=10702 && org_id!=10721 && org_id!=10644" >
                     <span v-if="org_id ==10612">
                       <span v-if="index == 1"> {{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</span>
                       <span v-if="index!=1"> {{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "" }}</span>
@@ -152,8 +152,8 @@
                   <td v-if="isShow('置换率')">{{item.replacement_rate?item.replacement_rate:''}}</td>
                   <td v-if="isShow('置换率1')">{{item.replacement_rate_one?item.replacement_rate_one:'/'}}</td>
                   <td v-if="isShow('置换量')" >
-                    <span v-if="org_id!=10702 && org_id!=10721"> {{item.displacement_quantity?item.displacement_quantity:''}}</span> 
-                    <span v-if="org_id==10702 || org_id == 10721"> {{item.displacement_quantity?item.displacement_quantity:'0'}}</span> 
+                    <span v-if="org_id!=10702 && org_id!=10721 && org_id!=10644"> {{item.displacement_quantity?item.displacement_quantity:''}}</span> 
+                    <span v-if="org_id==10702 || org_id == 10721 || org_id == 10644"> {{item.displacement_quantity?item.displacement_quantity:'0'}}</span> 
                   </td>
                  
                   <td v-if="isShow('SpO₂') && template_id != 6 && template_id != 10  && template_id != 11" >
@@ -2044,7 +2044,7 @@ methods: {
 
 
       //超滤率 超滤量自动计算
-      if(this.org_id == 10597 || this.org_id ==10599 || this.org_id ==10587 || this.org_id ==10571 || this.org_id==10579 || this.org_id ==10600 || this.org_id ==10612 || this.org_id ==10617 || this.org_id ==10580 || this.org_id ==10375 || this.org_id ==10629 || this.org_id ==10480  || this.org_id ==10414 || this.org_id ==10679 || this.org_id ==10693 || this.org_id == 10694 || this.org_id == 10697 || this.org_id ==10702 || this.org_id ==10723){
+      if(this.org_id == 10597 || this.org_id ==10599 || this.org_id ==10587 || this.org_id ==10571 || this.org_id==10579 || this.org_id ==10600 || this.org_id ==10612 || this.org_id ==10617 || this.org_id ==10580 || this.org_id ==10375 || this.org_id ==10629 || this.org_id ==10480  || this.org_id ==10414 || this.org_id ==10679 || this.org_id ==10693 || this.org_id == 10694 || this.org_id == 10697 || this.org_id ==10702 || this.org_id ==10723 || this.org_id == 10721){
 
         if(lastMonitorRecordList!=null){
           this.form.ultrafiltration_rate = lastMonitorRecordList.ultrafiltration_rate?lastMonitorRecordList.ultrafiltration_rate:""

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -843,7 +843,7 @@
                         {{ monitor.replacement_speed?monitor.replacement_speed:"" }}
                         <br />
                         </td>
-                      <td v-if="(org_id!=10683 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))"  width="50" >{{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}</td>
+                      <td v-if="(org_id!=10683 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))"  width="50" >{{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }}</td>
 
                       <td width="50" v-if="org_id == 3877 || org_id == 10449">{{monitor.filter_pressure }}</td>
                       <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675 || org_id ==10629 || org_id ==10517  || org_id == 10567 || org_id ==10724">

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -1914,8 +1914,19 @@ export default {
         const advicearr = []
         for(let i in this.doctor_advices){
           if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){
-            advicearr.push(this.doctor_advices[i])
+            if(this.doctor_advices[i].execution_frequency.indexOf("上机前") == -1 ){
+              advicearr.push(this.doctor_advices[i])
+            } 
+           
           }
+
+          // if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){
+             
+          //   if(this.doctor_advices[i].execution_frequency.indexOf("上机前") == -1 ){
+          //     advicearr.push(this.doctor_advices[i])
+          //   } 
+          // }
+
         }
         this.doctor_advices = []
         this.doctor_advices = advicearr

src/pages/main/today/TodayTab.vue

@@ -1418,7 +1418,7 @@ export default {
                  
                 //针对 濉溪杏康血液透析中心
                 if(this.$store.getters.user.template_info.org_id == 10721){
-                  if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1){
+                  if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1){
                     doctor_advices.push(his_doctor_advices[i])
                   }
                 }else{
@@ -1430,7 +1430,7 @@ export default {
                   doctor_advices = []
                   //针对 濉溪杏康血液透析中心
                   if(this.$store.getters.user.template_info.org_id == 10721){
-                    if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1){
+                    if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1){
                       doctor_advices.push(his_doctor_advices[i])
                     }
                   }else{

src/pages/main/today/dialysisMonitoring.vue

@@ -105,20 +105,20 @@
           <td v-if="isShow('跨膜压')" >{{ item.transmembrane_pressure ? item.transmembrane_pressure : "" }}</td>
           <td v-if="isShow('跨膜压1')" >{{ item.venous_pressure_one ? item.venous_pressure_one : "/" }}</td>
           <td v-if="isShow('超滤量')&&(org_id ==10551 || org_id ==10629 || org_id ==10679|| org_id ==10693 || org_id ==10702 || org_id == 10721)" >{{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</td>
-          <td v-if="isShow('超滤量')&&org_id !=10551 && org_id!=10629 && org_id != 10679&&org_id!=10693 &&org_id!=10702" >
-            <span v-if="org_id == 10612">
+          <td v-if="isShow('超滤量')&&org_id !=10551 && org_id!=10629 && org_id != 10679&&org_id!=10693 &&org_id!=10702 && org_id!=10721" >
+            <span v-if="org_id == 10612 || org_id == 10721">
               <span v-if="index == 1"> {{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</span>
                <span v-if="index!=1"> {{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "" }}</span>
             </span>
-            <span v-if="org_id != 10612">
+            <span v-if="org_id != 10612 && org_id!=10721">
               <span> {{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "" }}</span>
             </span>
 
           </td>
           <td v-if="isShow('超滤量1')" >{{item.ultrafiltration_volume_one?item.ultrafiltration_volume_one:'/'}}</td>
           <td v-if="isShow('超滤率')" >
-            <span v-if="org_id==10702">{{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}} </span> 
-            <span v-if="org_id!=10702">{{item.ultrafiltration_rate?item.ultrafiltration_rate:''}} </span> 
+            <span v-if="org_id==10702 || org_id == 10721">{{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}} </span> 
+            <span v-if="org_id!=10702 && org_id!=10721">{{item.ultrafiltration_rate?item.ultrafiltration_rate:''}} </span> 
           </td>
           <td v-if="isShow('超滤率2')" >{{item.ultrafiltration_rate_one?item.ultrafiltration_rate_one:''}}</td>
           <td v-if="isShow('钠浓度')">{{ item.sodium_concentration ? item.sodium_concentration : "" }}</td>