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.13546"
+  "version": "2999.999.13550"
 }

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -1191,19 +1191,21 @@
               v-if="
                 ($store.getters.user.template_info.template_id == 21 ||
                   $store.getters.user.template_info.template_id == 29 ||
-                  $store.getters.user.template_info.template_id == 53) &&
+                  $store.getters.user.template_info.template_id == 53 ||
+                  $store.getters.user.template_info.org_id == 10587) &&
                   $store.getters.user.template_info.org_id != 10249 &&
                   $store.getters.user.template_info.org_id != 9538
               "
               >置换液总量
-              <span v-if="dialysisPrescription.mode_id !=26"> (ml)</span>
-              <span v-if="dialysisPrescription.mode_id ==26"> (L/h)</span>
+              <span v-if="dialysisPrescription.mode_id !=26 && $store.getters.user.template_info.org_id !=10587"> (ml)</span>
+              <span v-if="dialysisPrescription.mode_id ==26 || $store.getters.user.template_info.org_id == 10587"> (L)</span>
               </span
             >
             <span
               v-if="
                 ($store.getters.user.template_info.template_id != 21 &&
                   $store.getters.user.template_info.template_id != 29 &&
+                  $store.getters.user.template_info.org_id!=10587 &&
                   $store.getters.user.template_info.template_id != 53) ||
                   $store.getters.user.template_info.org_id == 10249