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

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySix.vue

@@ -1404,7 +1404,7 @@ export default {
             this.patientInfo.first_dialysis_date = "";
           }
           this.check = response.data.data.check;
-          console.log("核对信息", this.check);
+          // console.log("核对信息", this.check);
           this.predialysis = response.data.data.PredialysisEvaluation;
           console.log("透前评估", this.predialysis);
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(

src/xt_pages/workforce/remind_print.vue

@@ -72,6 +72,9 @@
                   <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
                 <td :width="td_4_width" style="text-align:left" >
                   <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>