Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -336,11 +336,26 @@
                     </tr>
                     <!-- </thead>
                     <tbody> -->
-                    <tr v-for="(monitor_record, index) in record.monitor_records" :key="index">
-                      <td v-if="(index == 0&&monitor_record.systolic_blood_pressure&&monitor_record.diastolic_blood_pressure)||(index == 0&&monitor_record.result)">&nbsp;
-                        {{'透析前'}}
+                    <tr v-if="record.assessment_before_dislysis.systolic_blood_pressure != 0&&record.assessment_before_dislysis.diastolic_blood_pressure != 0||record.assessment_before_dislysis.remark.length > 0">
+                      <td>{{'透析前'}}</td>
+                      <td>{{record.assessment_before_dislysis&&record.assessment_before_dislysis.systolic_blood_pressure?record.assessment_before_dislysis.systolic_blood_pressure:''}}/{{record.assessment_before_dislysis &&record.assessment_before_dislysis.diastolic_blood_pressure?record.assessment_before_dislysis.diastolic_blood_pressure:''}}</td>
+                      <td>{{''}}</td>
+                      <td>{{''}}</td>
+                      <td>{{''}}/{{''}}</td>
+                      <td>{{''}}</td>
+                      <td>{{''}}</td>
+                      <td>{{''}}</td>
+                      <td> {{record.assessment_before_dislysis&&record.assessment_before_dislysis.remark.length>0?record.assessment_before_dislysis.remark:''}}</td>
+                      <td>
+                        <span v-if="setAdminUserES(record.assessment_before_dislysis.creater) == ''">{{getAdminUser(record.assessment_before_dislysis.creater)}}</span>
+                        <img class="es-img" :src="setAdminUserES(record.assessment_before_dislysis.creater)"  alt="" srcset="" v-else>
                       </td>
-                      <td v-else>{{getTime(monitor_record.operate_time,'{h}:{i}')}}</td>
+                    </tr>
+
+
+
+                    <tr v-for="(monitor_record, index) in record.monitor_records" :key="index">
+                      <td>{{getTime(monitor_record.operate_time,'{h}:{i}')}}</td>
                       <td>{{monitor_record.systolic_blood_pressure?monitor_record.systolic_blood_pressure:''}} /
                         {{monitor_record.diastolic_blood_pressure?monitor_record.diastolic_blood_pressure:''}}
                       </td>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -832,7 +832,7 @@
           <div class="row flex">
             <div class="inline_block">
               诊断：
-              <div class="under_line" style="width: 500px;">{{patientInfo.diagnose}}</div>
+              <div class="under_line_two" style="width: 500px;">{{patientInfo.diagnose}}</div>
             </div>
           </div>
           <table class="print-table-no" border="1"  count="0">