Browse Source

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

28169 1 year ago
parent
commit
eba4c2b65d

File diff suppressed because it is too large
+ 1768 - 1752
src/pages/main/newActionBar/dialysisPrescription.vue


+ 22 - 11
src/pages/main/template/DialysisPrintOrderSeventythree.vue View File

@@ -143,12 +143,12 @@
143 143
                 </div>
144 144
 
145 145
                 <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
146
-                  <div class="inline_block" style="flex: 1;">
146
+                  <!-- <div class="inline_block" style="flex: 1;">
147 147
                     透析间期:
148 148
                     <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
149 149
                       {{ predialysis.last_post_dialysis ? predialysis.last_post_dialysis : "/" }}
150 150
                     </div>
151
-                  </div>
151
+                  </div> -->
152 152
                   <div class="inline_block" style=" flex: 1">
153 153
                     透前症状:
154 154
                     <div
@@ -167,13 +167,21 @@
167 167
                       <span v-if="predialysis&&predialysis.symptom_before_dialysis==''&&predialysis.symptom_before_dialysis_other==''">/</span>
168 168
                     </div>
169 169
                   </div>
170
+                  <div class="inline_block" style=" flex: 1">
171
+                    跌倒评估:
172
+                    <div class="under_line"
173
+                      style="width: 50%; text-align: left;"
174
+                    >
175
+                      {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
176
+                    </div>
177
+                  </div>
170 178
                 </div>
171 179
 
172 180
                 <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
173 181
                   <div class="inline_block" style="flex: 1;">
174 182
                     内瘘:
175 183
                     <div class="under_line"
176
-                      style=" width: 60%; text-align: center;
184
+                      style=" width: 70%; text-align: left;
177 185
                         white-space: normal;
178 186
                       "
179 187
                     >
@@ -205,11 +213,11 @@
205 213
                   </div>
206 214
 
207 215
                   <div class="inline_block" style=" flex: 1">
208
-                    跌倒评估
209
-                    <div
210
-                      style="width: 50%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
216
+                    备注
217
+                    <div class="under_line"
218
+                      style="width: 70%; text-align: left;white-space: normal;"
211 219
                     >
212
-                      {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
220
+                      {{ predialysis.remark ? predialysis.remark : '/' }}
213 221
                     </div>
214 222
                   </div>
215 223
                 </div>
@@ -246,9 +254,9 @@
246 254
                       class="under_line"
247 255
                       style=" width: 50%; text-align: center; white-space: normal;"
248 256
                     >
249
-                    {{ predialysis.weight_before > 0 && predialysis.weight_after > 0
250
-                      ? parseFloat(predialysis.weight_before - predialysis.weight_after).toFixed(2): "/"
251
-                    }}
257
+                    {{ predialysis.weight_before > 0 && predialysis.additional_weight > 0 && predialysis.dry_weight > 0 ? 
258
+                        parseFloat(predialysis.weight_before - predialysis.additional_weight - predialysis.dry_weight ).toFixed(2): "/" 
259
+                      }}
252 260
                     </div>kg
253 261
                   </div>
254 262
 
@@ -916,7 +924,6 @@
916 924
                           {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} / 
917 925
                           {{  monitor.temperature ? monitor.temperature : '0' }}
918 926
                         </td>
919
-
920 927
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: "/"}}</td>
921 928
                         <td >{{monitor.breathing_rate ? monitor.breathing_rate : "/"}}</td>
922 929
                         <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
@@ -1442,6 +1449,7 @@ export default {
1442 1449
       // getDialysisRecord(this.queryParams).then(response => {
1443 1450
       var response = this.childResponse
1444 1451
       if (response.data.state == 1) {
1452
+        console.log('2222222222',response.data.data);
1445 1453
         this.adminUser = response.data.data.users
1446 1454
         this.users = response.data.data.users
1447 1455
         this.patientInfo = response.data.data.patientInfo
@@ -1857,6 +1865,9 @@ export default {
1857 1865
         case 2:
1858 1866
           return 'ml'
1859 1867
           break
1868
+        case 3:
1869
+          return 'kg'
1870
+          break
1860 1871
       }
1861 1872
     }
1862 1873
   },