Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/template/DialysisPrintOrdereighty.vue

@@ -161,7 +161,7 @@
                       {{
                         predialysis.pulse_frequency
                           ? predialysis.pulse_frequency
-                          : ""
+                          : "拒测"
                       }}
                     </div>
                     次/分
@@ -769,7 +769,7 @@
                     {{
                       afterdialysis.pulse_frequency
                         ? afterdialysis.pulse_frequency
-                        : ""
+                        : "拒测"
                     }}
                   </div>
                   次/分

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -1949,20 +1949,22 @@ export default {
         }
         this.loading = false
        const advice = response.data.data.advices
+       const advice2 = response.data.data.DoctorAdvice
         for(let i in advice){
           if(advice[i].id !=undefined ){
-            console.log('response.data.data',this.doctor_advices);
+           
             this.doctor_advices = advice
             //  response.data.data.advices == null ? [] : response.data.data.advices
           }
         }
+        this.doctor_advices = this.doctor_advices.concat(advice2)
+        console.log('response.data.data12111111',this.doctor_advices);
         const advicearr = []
         for(let i in this.doctor_advices){
           if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服' && this.doctor_advices[i].advice_name.indexOf('胰岛素')==-1){
             if(this.doctor_advices[i].execution_frequency.indexOf("上机前") == -1 ){
               advicearr.push(this.doctor_advices[i])
             }
-
           }
 
           // if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){

src/pages/main/template/DialysisPrintOrdereightytwo.vue

@@ -246,6 +246,12 @@
             </div>
           </div> -->
         </div>
+        <div class="row">
+          备注
+          <div class="inline_block under_line" style="width:90%;text-align: center;white-space: normal;">
+            {{ prescription.remark ? prescription.remark : '/'}}
+          </div>
+        </div>
         <div class="row">
           <div  style="display: inline-block;">
             上机医生