yq1 8 месяцев назад
Родитель
Сommit
8c0ec44873

+ 20 - 11
src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue Просмотреть файл

58
                   </tr>
58
                   </tr>
59
 
59
 
60
                    <tr>
60
                    <tr>
61
-                    <td colspan="3">
61
+                    <td colspan="2">
62
                       <div style="line-height:30px;">
62
                       <div style="line-height:30px;">
63
                         上机前病情:
63
                         上机前病情:
64
                         <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
64
                         <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
66
                         <span>{{record.assessment_before_dislysis.symptom_before_dialysis_other}}</span>
66
                         <span>{{record.assessment_before_dislysis.symptom_before_dialysis_other}}</span>
67
                       </div>
67
                       </div>
68
                     </td>
68
                     </td>
69
+                    <td>
70
+                      <div style="line-height:30px;">
71
+                        BP:
72
+                        {{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : ""}} /
73
+                        {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : ""}}
74
+                        mmHg
75
+                      </div>
76
+                      
77
+                    </td>
69
                   </tr>
78
                   </tr>
70
 
79
 
71
                   <tr>
80
                   <tr>
170
                   <td colspan="3">
179
                   <td colspan="3">
171
                     <div style="display: inline-block;line-height: 30px;">
180
                     <div style="display: inline-block;line-height: 30px;">
172
                       血管通路:
181
                       血管通路:
173
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
174
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
175
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
176
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='内瘘' &&
177
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='长期静脉导管' &&
178
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='临时静脉导管' &&
179
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!=''?true :false" showValue="其它">
180
-                      </label-box>
182
+                      {{ record.assessment_before_dislysis.blood_access_part_id ? record.assessment_before_dislysis.blood_access_part_id :'' }}
183
+                      {{ QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
181
                     </div>&nbsp;&nbsp;
184
                     </div>&nbsp;&nbsp;
182
                     <div style="display: inline-block;line-height: 30px;">
185
                     <div style="display: inline-block;line-height: 30px;">
183
                       穿刺者:
186
                       穿刺者:
586
                 for (let index = 0; index < delghTwo; index++) {
589
                 for (let index = 0; index < delghTwo; index++) {
587
                   this.records[recordIndex].advices.push([])
590
                   this.records[recordIndex].advices.push([])
588
                 }
591
                 }
592
+                for(let i  in this.records[recordIndex].his_advices){
593
+                  this.records[recordIndex].advices.unshift(this.records[recordIndex].his_advices[i])
594
+                }
589
               }
595
               }
590
-
596
+              console.log('his_advices',this.records[recordIndex].advices);
597
+              
591
               var childMap = {}
598
               var childMap = {}
592
               for (const index in this.records[recordIndex].advices) {
599
               for (const index in this.records[recordIndex].advices) {
593
                 if (this.records[recordIndex].advices[index].parent_id == 0) {
600
                 if (this.records[recordIndex].advices[index].parent_id == 0) {
620
                 }
627
                 }
621
                 advices.push(item)
628
                 advices.push(item)
622
               }
629
               }
623
-
630
+              // advices = advices.concat(this.records[recordIndex].his_advices)
631
+              console.log('advices',advices);
632
+              
624
               var leftAdvice = []
633
               var leftAdvice = []
625
               var rightAdvice = []
634
               var rightAdvice = []
626
               var adlen = advices.length
635
               var adlen = advices.length

+ 12 - 8
src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue Просмотреть файл

32
             </tr>
32
             </tr>
33
 
33
 
34
             <tr>
34
             <tr>
35
-              <td colspan="3">
35
+              <td colspan="2">
36
                 <div style="line-height:30px;">
36
                 <div style="line-height:30px;">
37
                   上机前病情:
37
                   上机前病情:
38
                   <!-- <span v-if="predialysis.symptom_before_dialysis_other==''"> -->
38
                   <!-- <span v-if="predialysis.symptom_before_dialysis_other==''"> -->
44
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
44
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
45
                 </div>
45
                 </div>
46
               </td>
46
               </td>
47
+              <td>
48
+                <div style="line-height:30px;">
49
+                  BP:
50
+                  {{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : ""}} /
51
+                  {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : ""}}
52
+                  mmHg
53
+                </div>
54
+                
55
+              </td>
47
             </tr>
56
             </tr>
48
 
57
 
49
             <tr>
58
             <tr>
151
             <td colspan="3">
160
             <td colspan="3">
152
               <div style="display: inline-block;line-height: 30px;">
161
               <div style="display: inline-block;line-height: 30px;">
153
                 血管通路:
162
                 血管通路:
154
-                <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
155
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
156
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
157
-                <label-box :isChecked="predialysis.blood_access_part_opera_name!='内瘘' &&
158
-                            predialysis.blood_access_part_opera_name!='长期静脉导管' &&
159
-                            predialysis.blood_access_part_opera_name!='临时静脉导管'?true :false" showValue="其它">
160
-                </label-box> -->
163
+          
164
+                {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id :'/' }}
161
                 {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name :'/' }}
165
                 {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name :'/' }}
162
               </div>&nbsp;&nbsp;
166
               </div>&nbsp;&nbsp;
163
               <div style="display: inline-block;line-height: 30px;">
167
               <div style="display: inline-block;line-height: 30px;">