8月7，79号打印单

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -58,7 +58,7 @@
                   </tr>
 
                    <tr>
-                    <td colspan="3">
+                    <td colspan="2">
                       <div style="line-height:30px;">
                         上机前病情:
                         <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
@@ -66,6 +66,15 @@
                         <span>{{record.assessment_before_dislysis.symptom_before_dialysis_other}}</span>
                       </div>
                     </td>
+                    <td>
+                      <div style="line-height:30px;">
+                        BP:
+                        {{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : ""}} /
+                        {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : ""}}
+                        mmHg
+                      </div>
+                      
+                    </td>
                   </tr>
 
                   <tr>
@@ -170,14 +179,8 @@
                   <td colspan="3">
                     <div style="display: inline-block;line-height: 30px;">
                       血管通路:
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='内瘘' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='长期静脉导管' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='临时静脉导管' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!=''?true :false" showValue="其它">
-                      </label-box>
+                      {{ record.assessment_before_dislysis.blood_access_part_id ? record.assessment_before_dislysis.blood_access_part_id :'' }}
+                      {{ QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
                     </div>&nbsp;&nbsp;
                     <div style="display: inline-block;line-height: 30px;">
                       穿刺者:
@@ -586,8 +589,12 @@
                 for (let index = 0; index < delghTwo; index++) {
                   this.records[recordIndex].advices.push([])
                 }
+                for(let i  in this.records[recordIndex].his_advices){
+                  this.records[recordIndex].advices.unshift(this.records[recordIndex].his_advices[i])
+                }
               }
-
+              console.log('his_advices',this.records[recordIndex].advices);
+              
               var childMap = {}
               for (const index in this.records[recordIndex].advices) {
                 if (this.records[recordIndex].advices[index].parent_id == 0) {
@@ -620,7 +627,9 @@
                 }
                 advices.push(item)
               }
-
+              // advices = advices.concat(this.records[recordIndex].his_advices)
+              console.log('advices',advices);
+              
               var leftAdvice = []
               var rightAdvice = []
               var adlen = advices.length

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -32,7 +32,7 @@
             </tr>
 
             <tr>
-              <td colspan="3">
+              <td colspan="2">
                 <div style="line-height:30px;">
                   上机前病情:
                   <!-- <span v-if="predialysis.symptom_before_dialysis_other==''"> -->
@@ -44,6 +44,15 @@
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
                 </div>
               </td>
+              <td>
+                <div style="line-height:30px;">
+                  BP:
+                  {{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : ""}} /
+                  {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : ""}}
+                  mmHg
+                </div>
+                
+              </td>
             </tr>
 
             <tr>
@@ -151,13 +160,8 @@
             <td colspan="3">
               <div style="display: inline-block;line-height: 30px;">
                 血管通路:
-                <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name!='内瘘' &&
-                            predialysis.blood_access_part_opera_name!='长期静脉导管' &&
-                            predialysis.blood_access_part_opera_name!='临时静脉导管'?true :false" showValue="其它">
-                </label-box> -->
+          
+                {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id :'/' }}
                 {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name :'/' }}
               </div>&nbsp;&nbsp;
               <div style="display: inline-block;line-height: 30px;">