Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1451,21 +1451,19 @@
                         >
                           <span v-if="advice.parent_id > 0">---></span>
                           <span v-if="advice.advice_name">{{ advice.advice_name }}</span>
-                          <span v-else>{{ advice.project.project_name }}</span>
+                          <span v-else-if="advice.project && advice.project.project_name">{{ advice.project.project_name }}</span>
 
                           <span v-if="advice && advice.advice_desc"
                             >({{ advice.advice_desc
                             }}{{ advice.drug_spec_unit }})</span
                           >
-                          <span v-if="advice && advice.project">{{advice.count}}{{advice.project.unit}}</span>
-                          <span v-if="advice.prescribing_number"
-                            >&nbsp;&nbsp; {{ advice.prescribing_number
-                            }}{{ advice.prescribing_number_unit }}</span
-                          >
+                          
+                         
                           <span v-if="advice.single_dose != 0"
                             >{{ advice.single_dose
                             }}{{ advice.single_dose_unit }}</span
                           >
+                          <span v-if="advice && advice.project">{{advice.project.unit}}</span>
                           <span v-if="advice.parent_id == 0">{{
                             advice.delivery_way
                           }}</span>