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.13759"
+  "version": "2999.999.13761"
 }

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -929,7 +929,8 @@
                           <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                           <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                           <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
-                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
+                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0 && org_id!=10644" >({{advice.remark}})</span>
+                          <span v-if="(org_id == 0 || org_id == 10644) && advice.remark.length>0" >({{ advice.remark }})</span>
                         </td>
                         <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
                           <span>{{advice.delivery_way}}</span>