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_forty.vue

                         <tbody>
                         <tr>
                             <td width="70">穿刺方式:</td>
-                            <td width="220">
+                            <td width="250">
                             <div>
                               <label-box showValue="绳梯" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></label-box>&nbsp;
                               <label-box showValue="定点" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('定点')>-1 ? true : false"></label-box>&nbsp;
-                              <label-box showValue="直接穿刺" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;             
+                              <label-box showValue="直接穿刺" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;   
+                              <label-box showValue="扣眼" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1 ? true:false"></label-box>&nbsp;                       
                             </div>
                             </td>
                            <td width="60"></td>
                             </td>
                             <td width="35">min</td>
                             <td width="60">去向</td>
-                            <td width="200">
+                            <td width="250">
                             <div style="display:flex;justify-content:space-between;">
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 2 ? true : false" showValue="留观"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 3 ? true : false" showValue="住院"></label-box>
+                                <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 4 ? true : false" showValue="门诊"></label-box>
                              </div>
                              </td>
-                              <td>
+                              <!-- <td>
                                  <div class="under-line">&nbsp;</div>
-                              </td>
+                              </td> -->
                             </tr>
                             </tbody>
                         </table>

src/xt_pages/dialysis/bloodPresssWatch.vue

           width="100"
         ></el-table-column>
 
+        <el-table-column label="透前血压(kg)" align="center" width="120" prop="pressure_name">
+          
+        </el-table-column>
+
         <el-table-column
           prop="dry_weight"
           label="干体重(kg)"
           align="center"
           width="120"
         ></el-table-column>
+
         <el-table-column
           prop="dialysis_after_weight"
           label="透后称重(kg)"
         } else {
           this.loading = false;
           this.total = response.data.data.total;
-          console.log(response.data.data.schedule)
+          console.log("世界文化遗产",response.data.data.schedule)
           for (let i = 0; i < response.data.data.schedule.length; i++) {
 
             if (response.data.data.schedule[i].patient&&response.data.data.schedule[i].patient.id > 0) {
                 SchedualPatientsTable["dialysis_after_weight"] =response.data.data.schedule[i].assessment_after_dislysis.weight_after;
               }
 
+
+              if (response.data.data.schedule[i].assessment_before_dislysis != null) {
+                SchedualPatientsTable["pressure_name"] =response.data.data.schedule[i].assessment_before_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_before_dislysis.diastolic_blood_pressure;
+              }
+           
+
+
+
               if(response.data.data.schedule[i].monitoring_record!=null &&response.data.data.schedule[i].monitoring_record.length >0 ){
                  SchedualPatientsTable["monitoring_record"]  = response.data.data.schedule[i].monitoring_record
               }

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

                       <label-box showValue="绳梯" :isChecked="predialysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></label-box>&nbsp;
                       <label-box showValue="定点" :isChecked="predialysis.puncture_way.indexOf('定点')>-1 ? true : false"></label-box>&nbsp;
                       <label-box showValue="直接穿刺" :isChecked="predialysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;
+                      <label-box showValue="扣眼" :isChecked="predialysis.puncture_way.indexOf('扣眼')>-1 ? true : false"></label-box>&nbsp;
                     </div>
                   </td>
                   <td width='20'></td>
                     </td>
                     <td width="20">min</td>
                     <td width="50">去向:</td>
-                      <td width="200">
+                      <td width="250">
                         <div style="display:flex;justify-content:space-between;">
                           <label-box :isChecked="afterdialysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
                           <label-box :isChecked="afterdialysis.patient_gose == 2 ? true : false" showValue="留观"></label-box>
                           <label-box :isChecked="afterdialysis.patient_gose == 3 ? true : false" showValue="住院"></label-box>
+                          <label-box :isChecked="afterdialysis.patient_gose == 4 ? true : false" showValue="门诊"></label-box>
                         </div>
                       </td>
-                      <td>
+                      <!-- <td>
                         <div class="under-line">&nbsp;</div>
-                      </td>
+                      </td> -->
                   </tr>
                   </tbody>
                 </table>