Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/user/courseOfDisease_new.vue

@@ -1175,7 +1175,7 @@
           anticoagulant_name = "IU"
        }
        if(val == 8){
-          anticoagulant_name = "IU/h"
+          anticoagulant_name = "IU"
        }
        if(val == 9){
           anticoagulant_name = "IU/h"
@@ -2338,15 +2338,22 @@
           //透前
           var befor_total =0
         var cha_weight = 0
+        var befor_weight =0
+        var after_weight =0
         var pingjun_weight = 0
         if(this.berforList!=null){
           befor_total = this.berforList.length
           for(let i=0;i<this.berforList.length;i++){
-             cha_weight += this.berforList[i].weight_before - this.berforList[i].WeightAfter
+            //  cha_weight += this.berforList[i].weight_before - this.berforList[i].WeightAfter
+            befor_weight +=this.berforList[i].weight_before
+            after_weight += this.berforList[i].WeightAfter
           }
         }
+        console.log("befor-weight",befor_weight)
+        console.log("after_weight",after_weight)
+        
 
-        pingjun_weight = (cha_weight/befor_total).toFixed(2)
+        pingjun_weight = ((befor_weight-after_weight)/befor_total).toFixed(2)
 
         //透后凝血
         var cruorNewArr = []
@@ -2519,7 +2526,7 @@
                 <td style="align-items: center;padding: 5px;">干体重</td>
                 <td style='padding: 5px;'>
                   <p>
-                    <span style='font-weight: bold;'>当前干体重：${this.lastDryWeight.dry_weight}</span>&nbsp;<span class="">kg;</span>
+                    <span style='font-weight: bold;'>当前干体重：${this.berforList[this.berforList.length-1].dry_weight}</span>&nbsp;<span class="">kg;</span>
                   </p>
                   <p>
                     <span style='font-weight: bold;'>调整记录：${dry_weight_str}</span>&nbsp;<span class=""></span>