新分支

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

@@ -1256,7 +1256,7 @@
             this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
             this.assessmentBeforeDislysis.blood_access_part_id = this.lastAssessment.blood_access_part_id
             
-            if(this.$store.getters.xt_user.template_info.org_id == 10375  || this.$store.getters.xt_user.template_info.org_id == 10571  || this.$store.getters.xt_user.template_info.org_id == 0){
+            if(this.$store.getters.xt_user.template_info.org_id == 10375  || this.$store.getters.xt_user.template_info.org_id == 10571  || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 10480){
               console.log("尽量",last_predialysis_evaluation)
               console.log("正常",this.assessmentBeforeDislysis.blood_access_part_opera_id)
               if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){

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

@@ -5297,7 +5297,7 @@ mu
         if(this.$store.getters.xt_user.template_info.org_id==10598){
            
           if(this.dialysisPrescription.mode_id == 3){
-             this.dialysisPrescription.target_ultrafiltration = this.dialysisPrescription.prescription_water  + 0.3
+             this.dialysisPrescription.target_ultrafiltration = parseFloat(this.dialysisPrescription.prescription_water)  + 0.3
           }else{
             if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
               this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water 

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

@@ -660,6 +660,22 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            prop="displacement_quantity"
+            align="center"
+            label="SpO₂(%)"
+            width="100"
+            v-if="org_id ==9829"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.blood_oxygen_saturation
+                  ? scope.row.blood_oxygen_saturation
+                  : "/"
+              }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"