解决冲突

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -337,7 +337,10 @@
                                     </div>
                                     <div class="inline_block" style="margin-left:20px;">
                                     维持：
-                                    <div class="under_line" style="width: 50px;text-align: center;">
+                                    <div v-if="prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
+                                        {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:'/'}}
+                                    </div>
+                                    <div v-if="prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
                                         {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:0}}
                                     </div>
                                     lu
@@ -452,12 +455,12 @@
                                             <td height="35px" colspan="2" class="advice-name" style="padding-left:7px;" >
                                                 <span v-if="advice.parent_id > 0">---></span>
                                                 <span >{{advice.advice_name }}</span>
-                                                <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                                                <span v-if="advice.prescribing_number">* {{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.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>({{advice.advice_desc}}{{advice.drug_spec_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.parent_id == 0  && advice.children.length == 0">{{advice.delivery_way}}</span>
+                                                <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.execution_frequency}}</span>
+                                                <span v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
                                             </td>
                                         <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
                                             <span>{{advice.delivery_way}}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -322,8 +322,11 @@
                   </div>
                   <div class="inline_block" style="margin-left:20px;">
                   维持：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:0}}
+                    <div v-if="prescription.anticoagulant == 1"  class="under_line" style="width: 50px;text-align: center;">
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"/"}}
+                    </div>
+                    <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
                     </div>
                     lu
                   </div>
@@ -442,8 +445,8 @@
                         <td height="35px" colspan="2" class="advice-name" style="padding-left:7px;" >
                           <span v-if="advice.parent_id > 0">---></span>
                           <span >{{advice.advice_name }}</span>
-                          <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                          <!-- <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
+                          <span>({{advice.advice_desc}}{{advice.drug_spec_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.parent_id == 0 ">{{advice.delivery_way}}</span>
                           <span v-if="advice.parent_id == 0  ">{{advice.execution_frequency}}</span>