Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -47,7 +47,11 @@
           </tr>
           <tr style="text-align:left">
             <td colspan="11" style="padding-left:5px">
-              上机前病情:{{ patientInfo.diagnose }}
+              上机前病情：{{
+                predialysis.symptom_before_dialysis
+                  ? predialysis.symptom_before_dialysis
+                  : ""
+              }}
             </td>
           </tr>
           <tr style="text-align:left">
@@ -184,7 +188,9 @@
                 >iu/h</span
               >
               &nbsp; 总量：<span style="width:50px;display: inline-block;">{{
-                prescription.anticoagulant_zongliang
+                prescription.anticoagulant_zongliang &&
+                (prescription.anticoagulant != "低分子肝素钙" ||
+                  prescription.anticoagulant == "低分子肝素钠")
                   ? prescription.anticoagulant_zongliang
                   : ""
               }}</span
@@ -739,7 +745,7 @@
             <p style="height:20px;line-height:20px">R</p>
             <p style="height:20px;line-height:20px">bpm</p>
           </th>
-          <th style="width:50px">
+          <th style="width:100px">
             <p style="height:20px;line-height:20px">BP</p>
             <p style="height:20px;line-height:20px">mmHg</p>
           </th>
@@ -1250,7 +1256,7 @@
             style="border:none;text-align:right;padding-right:100px;height:40px"
           >
             医生签名
-            <span style="display: inline-block;width:100px">
+            <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
               <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
               <span v-if="doctorForm.url !== ''">
@@ -1258,7 +1264,7 @@
               </span>
             </span>
             护士签名
-            <span style="display: inline-block;width:100px">
+            <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
               <p v-if="doctor_advices.length > 0">
                 <span