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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13757"
+  "version": "2999.999.13759"
 }

src/pages/main/DetailsPage.vue

@@ -1127,18 +1127,6 @@ export default {
             }
             
 
-            if(cityNameList!=null && cityNameList.length>0){
-              for(let i=0;i<cityNameList.length;i++){
-                cityNameList[i].sort = 0
-                cityNameList[i].sort = cityNameList[i].device_number.sort 
-              }
-            }
-       
-            this.newPatient = []
-            this.newPatient = cityNameList.sort(function (a, b) {
-                return a.sort > b.sort
-            })
-
 
             let firstName = {}
             this.FirstPin.forEach(item => {
@@ -1202,18 +1190,20 @@ export default {
               cityNameList.push(zoneArr[p])
             }
 
+            console.log("所有患者的数据=========================",cityNameList)
 
-            if(cityNameList!=null && cityNameList.length>0){
-              for(let i=0;i<cityNameList.length;i++){
-                cityNameList[i].sort = 0
-                cityNameList[i].sort = cityNameList[i].device_number.sort 
-              }
-            }
+
+            // if(cityNameList!=null && cityNameList.length>0){
+            //   for(let i=0;i<cityNameList.length;i++){
+            //     cityNameList[i].sort = 0
+            //     cityNameList[i].sort = cityNameList[i].device_number.sort 
+            //   }
+            // }
        
-            this.newPatient = []
-            this.newPatient = cityNameList.sort(function (a, b) {
-                return a.sort > b.sort
-            })
+            // this.newPatient = []
+            // this.newPatient = cityNameList.sort(function (a, b) {
+            //     return a.sort > b.sort
+            // })
               
            
           
@@ -1256,6 +1246,21 @@ export default {
         for (let p in arr) {
           cityNameList.push(arr[p])
         }
+
+          // //解决溪康排序问题  我的病人列表
+          if(cityNameList!=null && cityNameList.length>0){
+                for(let i=0;i<cityNameList.length;i++){
+                  cityNameList[i].sort = 0
+                  cityNameList[i].sort = cityNameList[i].device_number.sort 
+                }
+              }
+            
+              this.myPatientsOne = []
+              this.myPatientsOne = cityNameList.sort(function (a, b) {
+                  return a.sort > b.sort
+         })
+
+
         let firstName = {}
         this.FirstPin.forEach(item => {
           firstName[item] = []
@@ -1286,6 +1291,22 @@ export default {
         for (let p in arr) {
           cityNameList.push(arr[p])
         }
+
+
+       // //解决溪康排序问题  我的病人列表
+       if(cityNameList!=null && cityNameList.length>0){
+                for(let i=0;i<cityNameList.length;i++){
+                  cityNameList[i].sort = 0
+                  cityNameList[i].sort = cityNameList[i].device_number.sort 
+                }
+              }
+            
+              this.myPatientsOne = []
+              this.myPatientsOne = cityNameList.sort(function (a, b) {
+                  return a.sort > b.sort
+         })
+
+
         let firstName = {}
         this.FirstPin.forEach(item => {
           firstName[item] = []

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -384,7 +384,8 @@
                       <div class="under_line" style="width: 70px; text-align: center">
                         <span>
                           <span v-if="lastWeight.weight_after>0">{{ (predialysis.weight_before - predialysis.additional_weight - lastWeight.weight_after).toFixed(2)}}</span>
-                          <span v-if="lastWeight.weight_after<=0">{{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}</span>
+                          <span v-if="lastWeight.weight_after<=0 && afterdialysis.last_after_weight>0">{{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}</span>
+                          <span v-if="lastWeight.weight_after<=0 && afterdialysis.last_after_weight==0">/</span>
                         </span>
                       </div>
                       kg
@@ -393,8 +394,8 @@
                       超滤总量：
                       <div class="under_line" style="width: 60px; text-align: center">
                         {{
-                          prescription.target_ultrafiltration
-                            ? prescription.target_ultrafiltration
+                          prescription.prescription_water
+                            ? prescription.prescription_water
                             : "/"
                         }}
                       </div>