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/DialysisPrintOrderSeventythree.vue

@@ -143,12 +143,12 @@
                 </div>
 
                 <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
-                  <div class="inline_block" style="flex: 1;">
+                  <!-- <div class="inline_block" style="flex: 1;">
                     透析间期：
                     <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
                       {{ predialysis.last_post_dialysis ? predialysis.last_post_dialysis : "/" }}
                     </div>
-                  </div>
+                  </div> -->
                   <div class="inline_block" style=" flex: 1">
                     透前症状：
                     <div
@@ -167,13 +167,21 @@
                       <span v-if="predialysis&&predialysis.symptom_before_dialysis==''&&predialysis.symptom_before_dialysis_other==''">/</span>
                     </div>
                   </div>
+                  <div class="inline_block" style=" flex: 1">
+                    跌倒评估：
+                    <div class="under_line"
+                      style="width: 50%; text-align: left;"
+                    >
+                      {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
+                    </div>
+                  </div>
                 </div>
 
                 <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                   <div class="inline_block" style="flex: 1;">
                     内瘘：
                     <div class="under_line"
-                      style=" width: 60%; text-align: center;
+                      style=" width: 70%; text-align: left;
                         white-space: normal;
                       "
                     >
@@ -205,11 +213,11 @@
                   </div>
 
                   <div class="inline_block" style=" flex: 1">
-                    跌倒评估：
-                    <div
-                      style="width: 50%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                    备注：
+                    <div class="under_line"
+                      style="width: 70%; text-align: left;white-space: normal;"
                     >
-                      {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
+                      {{ predialysis.remark ? predialysis.remark : '/' }}
                     </div>
                   </div>
                 </div>
@@ -246,9 +254,9 @@
                       class="under_line"
                       style=" width: 50%; text-align: center; white-space: normal;"
                     >
-                    {{ predialysis.weight_before > 0 && predialysis.weight_after > 0
-                      ? parseFloat(predialysis.weight_before - predialysis.weight_after).toFixed(2): "/"
-                    }}
+                    {{ predialysis.weight_before > 0 && predialysis.additional_weight > 0 && predialysis.dry_weight > 0 ? 
+                        parseFloat(predialysis.weight_before - predialysis.additional_weight - predialysis.dry_weight ).toFixed(2): "/" 
+                      }}
                     </div>kg
                   </div>
 
@@ -916,7 +924,6 @@
                           {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} / 
                           {{  monitor.temperature ? monitor.temperature : '0' }}
                         </td>
-
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: "/"}}</td>
                         <td >{{monitor.breathing_rate ? monitor.breathing_rate : "/"}}</td>
                         <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
@@ -1442,6 +1449,7 @@ export default {
       // getDialysisRecord(this.queryParams).then(response => {
       var response = this.childResponse
       if (response.data.state == 1) {
+        console.log('2222222222',response.data.data);
         this.adminUser = response.data.data.users
         this.users = response.data.data.users
         this.patientInfo = response.data.data.patientInfo
@@ -1857,6 +1865,9 @@ export default {
         case 2:
           return 'ml'
           break
+        case 3:
+          return 'kg'
+          break
       }
     }
   },