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

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -22,18 +22,19 @@
             </td>
             <td width="30">岁</td>
 
-            <td width="50">住院号:</td>
+            
+            <td width="50">门诊号:</td>
             <td width="150">
               <div class="under-line">
-                  {{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number : "" }}
+                {{ patientInfo.dialysis_no ? patientInfo.dialysis_no : "" }}
               </div>
             </td>
             <td width="20"></td>
 
-            <td width="50">门诊号:</td>
+            <td width="50">住院号:</td>
             <td width="150">
-              <div class="under-line">
-                {{ patientInfo.dialysis_no ? patientInfo.dialysis_no : "" }}
+              <div class="under-line">&nbsp;
+                  {{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number : "/" }}
               </div>
             </td>
             <td></td>
@@ -45,7 +46,7 @@
           <tr>
             <td width="90">传染病标志:</td>
             <td width="80">
-              <div class="under-line">{{InfectiousDiseases?InfectiousDiseases:'无'}}</div>
+              <div class="under-line">{{InfectiousDiseases?InfectiousDiseases:'阴性'}}</div>
             </td>
             <td width="10"></td>
             <td width="110">上次透析时间:</td>
@@ -389,25 +390,25 @@
                       <td width='40'>体重:</td>
                       <td width='50'>干体重:</td>
                       <td width="50">
-                        <div class="under-line">&nbsp;{{ predialysis.dry_weight ? predialysis.dry_weight : "" }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}</div>
                       </td>
                       <td width="10">Kg</td>
                       <td width="30"></td>
                       <td width='70'>上次透后:</td>
                       <td width="50">
-                        <div class="under-line">&nbsp;{{ assessmentafter.weight_after ? assessmentafter.weight_after : "" }}</div>
+                        <div class="under-line">&nbsp;{{ assessmentafter.weight_after ? assessmentafter.weight_after : "/" }}</div>
                       </td>
                       <td width="10">Kg</td>
                       <td width="30"></td>
                       <td width='70'>本次透前:</td>
                       <td width="50">
-                        <div class="under-line">&nbsp;{{ predialysis.weight_before ? predialysis.weight_before : "" }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.weight_before ? predialysis.weight_before : "/" }}</div>
                       </td>
                       <td width="10">Kg</td>
                       <td width="30"></td>
                       <td width='70'>本次透后:</td>
                       <td width="50">
-                        <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}</div>
+                        <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "/" }}</div>
                       </td>
                       <td width="10">Kg</td>
                       <td></td>
@@ -452,7 +453,6 @@
               <table class="table-box">
                 <tbody>
                   <tr>
-                    <td width="90">预设超滤量:</td>
                     <td width="80">预设超滤量:</td>
                     <td width="50">
                       <div class="under-line">
@@ -474,10 +474,17 @@
                         <div class="under-line">&nbsp;{{ prescription.mode ? prescription.mode : "" }}</div>
                     </td>
                     <td width="20"></td>
-                    <td width="140">透析器/灌流器型号:</td>
+                    <td width="80">透析器:</td>
                     <td width="80">
                       <div class="under-line">
-                        &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
+                        &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.split('-')[0] : "" }}
+                      </div>
+                    </td>
+                    <td width="20"></td>
+                    <td width="80">灌流器型号:</td>
+                    <td width="80">
+                      <div class="under-line">
+                        &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus.split('-')[1] : "" }}
                       </div>
                     </td>
                     <td></td>
@@ -718,8 +725,10 @@
             <td>&nbsp;{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
             <td>&nbsp;{{ monitor.temperature ? monitor.temperature : '' }}</td>
             <td>
-              &nbsp;{{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
-              {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
+              <span v-if="monitor.systolic_blood_pressure || monitor.diastolic_blood_pressure">
+                &nbsp;{{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
+                {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
+              </span>
             </td>
             <td>&nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : '' }}</td>
             <td>&nbsp;{{ monitor.breathing_rate ? monitor.breathing_rate : '' }}</td>
@@ -823,7 +832,7 @@
               </table>
 
 
-              <table class="table-box" style="margin-bottom:200px;">
+              <table class="table-box" style="margin-bottom:130px;">
                 <tbody>
                   <tr>
                     <!-- <td width="70">其他记录:</td> -->