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.13738"
+  "version": "2999.999.13746"
 }

src/pages/main/newActionBar/monitoring.vue

@@ -152,7 +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('置换量')" >
-                    {{item.displacement_quantity?item.displacement_quantity:'0'}}
+                    <span v-if="org_id!=10702"> {{item.displacement_quantity?item.displacement_quantity:''}}</span> 
+                    <span v-if="org_id==10702"> {{item.displacement_quantity?item.displacement_quantity:'0'}}</span> 
                   </td>
                  
                   <td v-if="isShow('SpO₂') && template_id != 6 && template_id != 10  && template_id != 11" >
@@ -612,7 +613,10 @@
                               <td v-if="isShow('钠浓度')">{{item.sodium_concentration?item.sodium_concentration:''}}</td>
                               <td v-if="isShow('透析液温度')" >{{item.dialysate_temperature?item.dialysate_temperature:''}}</td>
                               <td v-if="isShow('置换率')">{{item.replacement_rate?item.replacement_rate:''}}</td>
-                              <td v-if="isShow('置换量')" >{{item.displacement_quantity?item.displacement_quantity:'0'}}</td>
+                              <td v-if="isShow('置换量')" >
+                                <span v-if="org_id ==10702"> {{item.displacement_quantity?item.displacement_quantity:'0'}} </span>
+                                <span v-if="org_id !=10702"> {{item.displacement_quantity?item.displacement_quantity:''}} </span>
+                              </td>
                               <td v-if="isShow('SpO₂') && template_id != 6 && template_id != 10  && template_id != 11" >
                                 <span v-if="org_id == 10340">{{item.blood_oxygen_saturation?item.blood_oxygen_saturation:'/'}}</span>
                                 <span v-else>{{item.blood_oxygen_saturation?item.blood_oxygen_saturation:''}}</span>

src/pages/main/today/dialysisMonitoring.vue

@@ -125,7 +125,12 @@
           <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('置换量')" >
-            {{ item.displacement_quantity ? item.displacement_quantity : "0" }}
+            <span v-if="org_d == 10702">
+              {{ item.displacement_quantity ? item.displacement_quantity : "0" }}
+            </span>
+            <span v-if="org_d != 10702">
+              {{ item.displacement_quantity ? item.displacement_quantity : "" }}
+            </span>
           </td>
           <th v-if="isShow('电导度')">{{ item.conductivity ? item.conductivity : "" }}</th>
           <th v-if="isShow('电导度1')">{{ item.conductivity_one ? item.conductivity_one : "/" }}</th>