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

src/xt_pages/dialysis/batch_print/batch_print_order_eightyfour.vue

@@ -367,11 +367,13 @@
                   <div style="flex: 1;">
                     <div style="display: inline-block;margin-right: 120px;">
                       <span style="display: inline-block;">医生签名:</span>杨能华/
-                      <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">
-                        {{ getAdminUser(record.prescription, 'prescription_doctor') }}
+                      <span v-if="record.advices.length>0">
+                        <span v-if="setAdminUserES(record.advices[0][0],'advice_doctor') == ''">
+                          {{ getAdminUser(record.advices[0][0],'advice_doctor') }}
+                        </span>
+                        <img class="es-img" :src="setAdminUserES(record.advices[0][0],'advice_doctor')" alt=""
+                          srcset="" v-else style="height: 30px;" />
                       </span>
-                      <img class="es-img" :src="setAdminUserES(record.prescription, 'prescription_doctor')" alt=""
-                        srcset="" v-else style="height: 30px;" />
                     </div>
                   </div>
                   <div style="flex: 1;">  

src/xt_pages/dialysis/template/DialysisPrintOrdereightyfour.vue

@@ -323,11 +323,13 @@
             <div style="flex: 1;">
               <div style="display: inline-block;margin-right: 120px;">
                 <span style="display: inline-block;">医生签名:</span>杨能华/
-                <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
-                  {{ getAdminUser(prescription.creater)}}
-                </span>
-                <span style="display: inline-block;" v-else>
-                  <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset />
+                <span v-if="tableAdvice.length>0">
+                  <span style="display: inline-block;" v-if="setAdminUserES(tableAdvice[0].advice_doctor) == ''">
+                    {{ getAdminUser(tableAdvice[0].advice_doctor)}}
+                  </span>
+                  <span style="display: inline-block;" v-else>
+                    <img style="height:30px;" :src="setAdminUserES(tableAdvice[0].advice_doctor)" alt srcset />
+                  </span>
                 </span>
               </div>
             </div>