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

src/pages/main/template/DialysisPrintOrderEight.vue

@@ -312,10 +312,8 @@
                 <td style="text-align:left;" colspan="3">
                     <span style="display:inline-block;margin-left:15px;">
                     <span>医生签名:
-                        <span v-if="advices.length == 0"></span>
-                        <span v-else-if="setAdminUserES(advices[0][0].advice_doctor) == ''">{{getAdminUser(advices[0][0].advice_doctor)}}</span>
-                        <img class="es-img" :src="setAdminUserES(advices[0][0].advice_doctor)"
-                             alt="" srcset="" v-else>
+                      <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) == ''">{{getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater))}}</span>
+                        <img v-else class="es-img" style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater))" alt="" srcset="">
                     </span>
                     </span>
                 </td>

src/pages/main/template/DialysisPrintOrderThirteen.vue

@@ -337,7 +337,7 @@
             <td width="50" style="text-align:left;border:none;">
               <div>
                 <span class="under_line" style="width:50px;display:inline-block">
-                  {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
+                  {{ afterdialysis.pulse_frequency ? afterdialysis.pulse_frequency : "" }}
                 </span>次/分
               </div>
             </td>
@@ -377,9 +377,9 @@
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="setAdminUserES(prescription==null?0:prescription.creater) == ''">{{getAdminUser(prescription==null?0:prescription.creater)}}</span>
+              <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) == ''">{{getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater))}}</span>
               <span v-else style="display:flex;align-items:center;height:36px;">
-                <img style="height:30px;" :src="setAdminUserES(prescription==null?0:prescription.creater)" alt="" srcset="">
+                <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater))" alt="" srcset="">
               </span>
           </span>
             
@@ -779,7 +779,7 @@ export default {
           if (this.prescription.anticoagulant == 7) {
             this.prescription.anticoagulant = "低分子肝素钠";
           }
-          
+
           var receiverTreatmentAccess =
             response.data.data.receiverTreatmentAccess
           console.log('接诊评估', this.receiverTreatmentAccess)