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.13755"
+  "version": "2999.999.13757"
 }

src/pages/main/DetailsPage.vue

@@ -126,10 +126,9 @@
 
         <van-tabs v-model="active">
           <van-tab title="我的病人">
-            <van-index-bar class="indexBar" sticky highlight-color="#fb6463">
-              <div v-for="(subItem, index) in mypatients" :key="index" :index="index">
+            <van-index-bar class="indexBar" sticky highlight-color="#fb6463"  >
+              <div v-for="(subItem, index) in mypatients" :key="index" :index="index" v-if="$store.getters.user.template_info.org_id!=10721">
                 <van-index-anchor :index="index">
-                  <!-- <span class="indexWord">{{ index }}</span> -->
                 </van-index-anchor>
                 <van-cell
                   @click="choosePatient(item)"
@@ -138,13 +137,20 @@
                   :title="item.patient.name"
                 />
               </div>
+              <div  :key="index" :index="index" v-if="$store.getters.user.template_info.org_id==10721">
+                <van-cell
+                  @click="choosePatient(item)"
+                  v-for="(item, subIndex) in myPatientsOne"
+                  :key="subIndex"
+                  :title="item.patient.name+ '' +'('+ item.device_number.number+')'"
+                />
+              </div>
             </van-index-bar>
           </van-tab>
           <van-tab title="全部病人">
             <van-index-bar class="indexBar" sticky highlight-color="#fb6463">
-              <div v-for="(subItem, index) in patients" :key="index" :index="index">
+              <div v-for="(subItem, index) in patients" :key="index" :index="index" v-if="$store.getters.user.template_info.org_id!=10721">
                 <van-index-anchor :index="index">
-                  <!-- <span class="indexWord">{{ index }}</span> -->
                 </van-index-anchor>
                 <van-cell
                   @click="choosePatient(item)"
@@ -153,6 +159,16 @@
                   :title="item.patient.name"
                 />
               </div>
+
+              <div  v-if="$store.getters.user.template_info.org_id==10721">
+               
+                <van-cell
+                  @click="choosePatient(item)"
+                  v-for="(item, subIndex) in newPatient"
+                  :key="subIndex"
+                  :title="item.patient.name+ '' +'('+ item.device_number.number+')'"
+                />
+              </div>
             </van-index-bar>
           </van-tab>
         </van-tabs>
@@ -272,7 +288,8 @@ export default {
       zoneValue: 0,
       zoneShow: false,
       zoneColumns: [],
-
+      myPatientsOne:[],
+      newPatient:[],
       //
       users: {
         name: '',
@@ -738,10 +755,10 @@ export default {
     getScheduals (patient) {
       // console.log('222222', this.$store.getters.adminUserArr.adminUserArr)
       if (this.$store.getters.adminUserArr.adminUserArr) {
-        // console.log('上面')
+        console.log('上面')
         this.getAdminUser(patient)
       } else {
-        // console.log('下面')
+        console.log('下面')
         this.dialysisGlobalConfig(patient)
       }
 
@@ -768,10 +785,36 @@ export default {
           }
         })
       }
+
+     
+
+     
+
+
       let cityNameList = []
       for (let p in zoneNewPatients) {
         cityNameList.push(zoneNewPatients[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 
+          }
+        }
+       
+        this.newPatient = []
+        this.newPatient = cityNameList.sort(function (a, b) {
+            return a.sort > b.sort
+         })
+
+
+
+
       let firstName = {}
       this.FirstPin.forEach(item => {
         firstName[item] = []
@@ -782,6 +825,12 @@ export default {
           }
         })
         this.patients = firstName
+
+      
+
+       
+        
+        
         // 判断非空
         let newObj = {}
         Object.keys(this.patients).map((item, index) => {
@@ -790,6 +839,10 @@ export default {
           }
         })
         this.patients = newObj
+
+     
+       
+        
         // console.log('所有的病人', this.patients)
       })
     },
@@ -856,7 +909,19 @@ export default {
       this.show = false
     },
     getAdminUser (patient) {
-      // console.log('user---', this.users.user_type)
+      // console.log("病人列表-----------------------------------",patient)
+
+      // if(patient!=null && patient.length>0){
+      //   for(let i=0;i<patient.length;i++){
+      //      patient[i].sort= 0
+      //      patient[i].sort = patient[i].device_number.sort
+      //   }
+      //   this.newPatient =  patient.sort(function (a, b) {
+      //       return a.sort > b.sort
+      //    })
+      // }
+
+      console.log('user---', this.users.user_type)
       if (this.users.user_type == 1 || this.users.user_type == 2) {
         // console.log('触发了吗')
         let arr = []
@@ -877,7 +942,25 @@ export default {
             zoneArr.push(item)
           }
         })
+
+        if(zoneArr!=null && zoneArr.length>0){
+          for(let i=0;i<zoneArr.length;i++){
+            zoneArr[i].sort = 0
+            zoneArr[i].sort = zoneArr[i].device_number.sort 
+          }
+        }
+       
+        this.myPatientsOne = []
+        this.myPatientsOne = zoneArr.sort(function (a, b) {
+            return a.sort > b.sort
+         })
+
+       
+
         this.searchArr = zoneArr
+
+
+
         let cityNameList = []
         for (let p in zoneArr) {
           cityNameList.push(zoneArr[p])
@@ -891,6 +974,8 @@ export default {
               firstName[item].push(el)
             }
           })
+         
+
           this.mypatients = firstName
           // 判断非空
           let newObj = {}
@@ -905,8 +990,7 @@ export default {
       } else if (this.users.user_type == 3) {
         let arr = []
         let zoneArr = []
-        console.log('武警机构ID', this.$store.getters.user.template_info.org_id)
-        console.log('9999999', patient)
+       
 
         if (this.$store.getters.user.template_info.org_id == 10340) {
           patient.map((item, index) => {
@@ -924,7 +1008,7 @@ export default {
               }
             }
           })
-          console.log('arr0------------------', arr)
+          
         } else {
           patient.map((item, index) => {
             if (item.dialysis_order != null && item.dialysis_order.start_nurse == this.users.id) {
@@ -937,6 +1021,8 @@ export default {
           })
         }
 
+
+
         arr.map(item => {
           if (item.device_number.zone_id == this.zoneValue) {
             zoneArr.push(item)
@@ -944,11 +1030,32 @@ export default {
             zoneArr.push(item)
           }
         })
-        // console.log('arr', arr)
+
+        console.log("zoneArr---------------------",zoneArr)
+       
+
+        // //解决溪康排序问题  我的病人列表
+        if(zoneArr!=null && zoneArr.length>0){
+          for(let i=0;i<zoneArr.length;i++){
+            zoneArr[i].sort = 0
+            zoneArr[i].sort = zoneArr[i].device_number.sort 
+          }
+        }
+       
+        this.myPatientsOne = []
+        this.myPatientsOne = zoneArr.sort(function (a, b) {
+            return a.sort > b.sort
+         })
+
+      
+
         let cityNameList = []
         for (let p in zoneArr) {
           cityNameList.push(zoneArr[p])
         }
+
+        
+
         let firstName = {}
         this.FirstPin.forEach(item => {
           firstName[item] = []
@@ -958,6 +1065,7 @@ export default {
               firstName[item].push(el)
             }
           })
+         
           this.mypatients = firstName
           // 判断非空
           let newObj = {}
@@ -969,6 +1077,8 @@ export default {
           this.mypatients = newObj
         })
         console.log('我的病人', this.mypatients)
+        
+      
       }
     },
     dialysisGlobalConfig (patient) {
@@ -996,11 +1106,40 @@ export default {
                 zoneArr.push(item)
               }
             })
+              // //解决溪康排序问题  我的病人列表
+             if(zoneArr!=null && zoneArr.length>0){
+                for(let i=0;i<zoneArr.length;i++){
+                  zoneArr[i].sort = 0
+                  zoneArr[i].sort = zoneArr[i].device_number.sort 
+                }
+              }
+            
+              this.myPatientsOne = []
+              this.myPatientsOne = zoneArr.sort(function (a, b) {
+                  return a.sort > b.sort
+              })
+
             this.searchArr = zoneArr
+
             let cityNameList = []
             for (let p in zoneArr) {
               cityNameList.push(zoneArr[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.newPatient = []
+            this.newPatient = cityNameList.sort(function (a, b) {
+                return a.sort > b.sort
+            })
+
+
             let firstName = {}
             this.FirstPin.forEach(item => {
               firstName[item] = []
@@ -1040,11 +1179,46 @@ export default {
                 zoneArr.push(item)
               }
             })
+
+
+              // //解决溪康排序问题  我的病人列表
+              if(zoneArr!=null && zoneArr.length>0){
+                for(let i=0;i<zoneArr.length;i++){
+                  zoneArr[i].sort = 0
+                  zoneArr[i].sort = zoneArr[i].device_number.sort 
+                }
+              }
+            
+              this.myPatientsOne = []
+              this.myPatientsOne = zoneArr.sort(function (a, b) {
+                  return a.sort > b.sort
+              })
+
+
+
             // console.log('arr', arr)
             let cityNameList = []
             for (let p in zoneArr) {
               cityNameList.push(zoneArr[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.newPatient = []
+            this.newPatient = cityNameList.sort(function (a, b) {
+                return a.sort > b.sort
+            })
+              
+           
+          
+
+
             let firstName = {}
             this.FirstPin.forEach(item => {
               firstName[item] = []

src/pages/main/newActionBar/assessmentAfter.vue

@@ -7,8 +7,8 @@
             <van-cell>
                 <template #title>
                     <span style="color:#7b8c9c" v-if="prescription_prop!=null">目标超滤量:{{prescription_prop.target_ultrafiltration}}</span>
-                    <span style="color:#7b8c9c"  v-if="$store.getters.user.template_info.template_id != 9 && $store.getters.user.template_info.template_id != 17 && $store.getters.user.template_info.template_id != 20 && $store.getters.user.template_info.template_id != 21 && $store.getters.user.template_info.template_id != 22  && $store.getters.user.template_info.template_id != 23 && $store.getters.user.template_info.template_id != 24 && $store.getters.user.template_info.template_id != 26 && $store.getters.user.template_info.template_id != 28 && $store.getters.user.template_info.template_id != 27 && $store.getters.user.template_info.template_id != 29 && $store.getters.user.template_info.template_id != 30 && $store.getters.user.template_info.template_id != 31 && $store.getters.user.template_info.template_id != 32 && $store.getters.user.template_info.template_id != 34 && $store.getters.user.template_info.template_id != 38 && $store.getters.user.template_info.template_id != 40 && $store.getters.user.template_info.template_id != 43 && $store.getters.user.template_info.org_id!=9555 && $store.getters.user.template_info.template_id != 60  && $store.getters.user.template_info.org_id!=10340 && $store.getters.user.template_info.org_id!=10387 && $store.getters.user.template_info.org_id!=10430 && $store.getters.user.template_info.org_id!=10441 && $store.getters.user.template_info.org_id!=10445 && $store.getters.user.template_info.org_id!=9829 && $store.getters.user.template_info.org_id!=10440 && $store.getters.user.template_info.org_id!=10469 && $store.getters.user.template_info.org_id!=10460 && $store.getters.user.template_info.org_id!=10723">L</span>
-                    <span style="color:#7b8c9c"  v-if="$store.getters.user.template_info.template_id == 9 || $store.getters.user.template_info.template_id == 17 || $store.getters.user.template_info.template_id == 20 || $store.getters.user.template_info.template_id == 21 || $store.getters.user.template_info.template_id == 22 || $store.getters.user.template_info.template_id == 23 || $store.getters.user.template_info.template_id == 24 || $store.getters.user.template_info.template_id == 26 || $store.getters.user.template_info.template_id == 28 || $store.getters.user.template_info.template_id == 27 || $store.getters.user.template_info.template_id == 29 || $store.getters.user.template_info.template_id == 30 || $store.getters.user.template_info.template_id == 31 || $store.getters.user.template_info.template_id == 32 || $store.getters.user.template_info.template_id == 34 || $store.getters.user.template_info.template_id == 38 || $store.getters.user.template_info.template_id == 40 || $store.getters.user.template_info.template_id == 43 || $store.getters.user.template_info.org_id==9555 || $store.getters.user.template_info.template_id==60|| $store.getters.user.template_info.org_id==10340 || $store.getters.user.template_info.org_id==10387 || $store.getters.user.template_info.org_id==10430  || $store.getters.user.template_info.org_id==10441 || $store.getters.user.template_info.org_id==10445 || $store.getters.user.template_info.org_id==9829 ||  $store.getters.user.template_info.org_id==10440 ||  $store.getters.user.template_info.org_id==10469 ||  $store.getters.user.template_info.org_id==10460 ||  $store.getters.user.template_info.org_id==10723">ml</span>
+                    <span style="color:#7b8c9c"  v-if="$store.getters.user.template_info.template_id != 9 && $store.getters.user.template_info.template_id != 17 && $store.getters.user.template_info.template_id != 20 && $store.getters.user.template_info.template_id != 21 && $store.getters.user.template_info.template_id != 22  && $store.getters.user.template_info.template_id != 23 && $store.getters.user.template_info.template_id != 24 && $store.getters.user.template_info.template_id != 26 && $store.getters.user.template_info.template_id != 28 && $store.getters.user.template_info.template_id != 27 && $store.getters.user.template_info.template_id != 29 && $store.getters.user.template_info.template_id != 30 && $store.getters.user.template_info.template_id != 31 && $store.getters.user.template_info.template_id != 32 && $store.getters.user.template_info.template_id != 34 && $store.getters.user.template_info.template_id != 38 && $store.getters.user.template_info.template_id != 40 && $store.getters.user.template_info.template_id != 43 && $store.getters.user.template_info.org_id!=9555 && $store.getters.user.template_info.template_id != 60  && $store.getters.user.template_info.org_id!=10340 && $store.getters.user.template_info.org_id!=10387 && $store.getters.user.template_info.org_id!=10430 && $store.getters.user.template_info.org_id!=10441 && $store.getters.user.template_info.org_id!=10445 && $store.getters.user.template_info.org_id!=9829 && $store.getters.user.template_info.org_id!=10440 && $store.getters.user.template_info.org_id!=10469 && $store.getters.user.template_info.org_id!=10460 && $store.getters.user.template_info.org_id!=10723 && $store.getters.user.template_info.org_id!=10731">L</span>
+                    <span style="color:#7b8c9c"  v-if="$store.getters.user.template_info.template_id == 9 || $store.getters.user.template_info.template_id == 17 || $store.getters.user.template_info.template_id == 20 || $store.getters.user.template_info.template_id == 21 || $store.getters.user.template_info.template_id == 22 || $store.getters.user.template_info.template_id == 23 || $store.getters.user.template_info.template_id == 24 || $store.getters.user.template_info.template_id == 26 || $store.getters.user.template_info.template_id == 28 || $store.getters.user.template_info.template_id == 27 || $store.getters.user.template_info.template_id == 29 || $store.getters.user.template_info.template_id == 30 || $store.getters.user.template_info.template_id == 31 || $store.getters.user.template_info.template_id == 32 || $store.getters.user.template_info.template_id == 34 || $store.getters.user.template_info.template_id == 38 || $store.getters.user.template_info.template_id == 40 || $store.getters.user.template_info.template_id == 43 || $store.getters.user.template_info.org_id==9555 || $store.getters.user.template_info.template_id==60|| $store.getters.user.template_info.org_id==10340 || $store.getters.user.template_info.org_id==10387 || $store.getters.user.template_info.org_id==10430  || $store.getters.user.template_info.org_id==10441 || $store.getters.user.template_info.org_id==10445 || $store.getters.user.template_info.org_id==9829 ||  $store.getters.user.template_info.org_id==10440 ||  $store.getters.user.template_info.org_id==10469 ||  $store.getters.user.template_info.org_id==10460 ||  $store.getters.user.template_info.org_id==10723 ||  $store.getters.user.template_info.org_id==10731">ml</span>
                     &nbsp;&nbsp;&nbsp;&nbsp;
                     <span style="color:#7b8c9c" v-if="prescription_prop!=null && ($store.getters.user.template_info.org_id == 9671 || $store.getters.user.template_info.org_id == 10469)">处方脱水量:{{prescription_prop.prescription_water}}ml</span>
                     &nbsp;&nbsp;&nbsp;&nbsp;
@@ -21,7 +21,7 @@
                 <van-field v-model="timeValue" readonly @click="openPicker" @focus="inputFocus" v-if="isShow('实际治疗时长')" :required="isShow_title('实际治疗时长')" label="实际治疗时长" input-align="right"/>
                 <van-field v-model="formValue.actual_ultrafiltration" @focus="inputFocus" v-if="isShow('实际超滤量')" :required="isShow_title('实际超滤量')" type="number" input-align="right">
                     <template #label>
-                        <span v-if="(template_id == 6 && $store.getters.user.template_info.org_id !=10447 && $store.getters.user.template_info.org_id !=10471) || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 17 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 28 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 56 || template_id == 60 || $store.getters.user.template_info.org_id == 9555 || $store.getters.user.template_info.org_id == 10307 || $store.getters.user.template_info.org_id == 10340 || $store.getters.user.template_info.org_id == 10387 || $store.getters.user.template_info.org_id == 10430 || $store.getters.user.template_info.org_id == 10432 || $store.getters.user.template_info.org_id == 10441 || $store.getters.user.template_info.org_id == 10445 || $store.getters.user.template_info.org_id == 10495 || $store.getters.user.template_info.org_id == 10375  || $store.getters.user.template_info.org_id == 10551 || $store.getters.user.template_info.org_id == 10597 || $store.getters.user.template_info.org_id == 10599 || $store.getters.user.template_info.org_id == 10580 || $store.getters.user.template_info.org_id == 10629 || $store.getters.user.template_info.org_id == 10617 || $store.getters.user.template_info.org_id == 10677 || $store.getters.user.template_info.org_id == 10667 || $store.getters.user.template_info.org_id == 10480 || $store.getters.user.template_info.org_id == 10693 || $store.getters.user.template_info.org_id == 10702 || $store.getters.user.template_info.org_id == 10697 || $store.getters.user.template_info.org_id == 10635 ||  $store.getters.user.template_info.org_id == 10723 ||  $store.getters.user.template_info.org_id == 10721">实际超滤量(ml)</span>
+                        <span v-if="(template_id == 6 && $store.getters.user.template_info.org_id !=10447 && $store.getters.user.template_info.org_id !=10471 && $store.getters.user.template_info.org_id !=10624) || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 17 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 28 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 56 || template_id == 60 || $store.getters.user.template_info.org_id == 9555 || $store.getters.user.template_info.org_id == 10307 || $store.getters.user.template_info.org_id == 10340 || $store.getters.user.template_info.org_id == 10387 || $store.getters.user.template_info.org_id == 10430 || $store.getters.user.template_info.org_id == 10432 || $store.getters.user.template_info.org_id == 10441 || $store.getters.user.template_info.org_id == 10445 || $store.getters.user.template_info.org_id == 10495 || $store.getters.user.template_info.org_id == 10375  || $store.getters.user.template_info.org_id == 10551 || $store.getters.user.template_info.org_id == 10597 || $store.getters.user.template_info.org_id == 10599 || $store.getters.user.template_info.org_id == 10580 || $store.getters.user.template_info.org_id == 10629 || $store.getters.user.template_info.org_id == 10617 || $store.getters.user.template_info.org_id == 10677 || $store.getters.user.template_info.org_id == 10667 || $store.getters.user.template_info.org_id == 10480 || $store.getters.user.template_info.org_id == 10693 || $store.getters.user.template_info.org_id == 10702 || $store.getters.user.template_info.org_id == 10697 || $store.getters.user.template_info.org_id == 10635 ||  $store.getters.user.template_info.org_id == 10723 ||  $store.getters.user.template_info.org_id == 10721">实际超滤量(ml)</span>
                         <span v-else>实际超滤量(L)</span>
                     </template>
                 </van-field>

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -153,7 +153,8 @@
                 $store.getters.user.template_info.org_id!=10644 &&
                 $store.getters.user.template_info.org_id!=10667 &&
                 $store.getters.user.template_info.org_id!=10723 &&
-                $store.getters.user.template_info.org_id!=10727)||
+                $store.getters.user.template_info.org_id!=10727&&
+                $store.getters.user.template_info.org_id!=10731)||
                 $store.getters.user.template_info.org_id==10633
               "
               >目标超滤量(L)</span
@@ -197,7 +198,8 @@
                 $store.getters.user.template_info.org_id == 10644 ||
                 $store.getters.user.template_info.org_id == 10667 ||
                 $store.getters.user.template_info.org_id == 10723 ||
-                $store.getters.user.template_info.org_id == 10727)&&
+                $store.getters.user.template_info.org_id == 10727 ||
+                $store.getters.user.template_info.org_id == 10731)&&
                 $store.getters.user.template_info.org_id != 10633
               "
               >目标超滤量(ml)</span
@@ -1073,7 +1075,7 @@
         <van-collapse-item v-if="isShow('置换液')" name="9" v-show="huShow">
           <template #title>
             <span v-if="$store.getters.user.template_info.template_id != 6"
-              ><span v-if="isShow_title('置换液')&&$store.getters.user.template_info.template_id != 6" class="warn_tip">*</span>置换液</span
+              ><span v-if="isShow_title('置换液')&&$store.getters.user.template_info.template_id != 6" class="warn_tip">*</span>置换方式</span
             >
             <span v-if="$store.getters.user.template_info.template_id == 6"
               ><span v-if="isShow_title('置换液')&&$store.getters.user.template_info.template_id == 6" class="warn_tip">*</span>置换方式</span

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -1193,11 +1193,11 @@
                   <div class="under_line" style="width: 50px;text-align: center">
                     {{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:'/'}}
                   </div>
-                  <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10471">
+                  <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10471 &&org_id!=10624">
                     ml
                   </span>
 
-                  <span v-if="org_id==9675||org_id==10447 || org_id == 10471">
+                  <span v-if="org_id==9675||org_id==10447 || org_id == 10471 || org_id ==10624">
                    L
                   </span>
 

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -383,7 +383,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
@@ -392,8 +393,8 @@
                     超滤总量：
                     <div class="under_line" style="width: 60px; text-align: center">
                       {{
-                        prescription.target_ultrafiltration
-                          ? prescription.target_ultrafiltration
+                        prescription.prescription_water
+                          ? prescription.prescription_water
                           : "/"
                       }}
                     </div>
@@ -1371,7 +1372,7 @@ export default {
       } if (this.predialysis.weight_before == 0) {
         const obj19 ='透前体重'
         checkDate.push(obj19)
-      } if (this.prescription.target_ultrafiltration == 0) {
+      } if (this.prescription.prescription_water == 0) {
         const obj20 ='超滤总量'
         checkDate.push(obj20)
       } if (this.prescription.calcium == 0) {

src/pages/main/today/dialysisPrescription.vue

@@ -16,8 +16,8 @@
         <li v-if="isShow('目标超滤量')">
           <label>目标超滤量 :</label>
           <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
-          <span v-if="this.$store.getters.user.template_info.template_id != 9 && this.$store.getters.user.template_info.template_id != 17 && this.$store.getters.user.template_info.template_id != 20 && this.$store.getters.user.template_info.template_id != 21 && this.$store.getters.user.template_info.template_id != 22 && this.$store.getters.user.template_info.template_id != 23 && this.$store.getters.user.template_info.template_id != 24 && this.$store.getters.user.template_info.template_id != 26 && this.$store.getters.user.template_info.template_id != 28 && this.$store.getters.user.template_info.org_id!=9555 && this.$store.getters.user.template_info.template_id != 27  && this.$store.getters.user.template_info.template_id != 30  && this.$store.getters.user.template_info.template_id != 32 && this.$store.getters.user.template_info.template_id != 38 && this.$store.getters.user.template_info.template_id != 40 && this.$store.getters.user.template_info.template_id != 43 && this.$store.getters.user.template_info.template_id != 45  && this.$store.getters.user.template_info.template_id != 46 && this.$store.getters.user.template_info.template_id != 48 && this.$store.getters.user.template_info.template_id != 56 &&  this.$store.getters.user.template_info.org_id!=10395 &&  this.$store.getters.user.template_info.org_id!=10340 && this.$store.getters.user.template_info.template_id != 60 &&  this.$store.getters.user.template_info.org_id!=10430 &&  this.$store.getters.user.template_info.org_id!=10432 &&  this.$store.getters.user.template_info.org_id!=10441 && this.$store.getters.user.template_info.org_id!=10445 && this.$store.getters.user.template_info.org_id!=9829 && this.$store.getters.user.template_info.org_id!=10440 && this.$store.getters.user.template_info.org_id!=10469 && this.$store.getters.user.template_info.org_id!=10460 && this.$store.getters.user.template_info.org_id!=10644 && this.$store.getters.user.template_info.org_id!=10667 && this.$store.getters.user.template_info.org_id!=10723&& this.$store.getters.user.template_info.org_id!=10727" class="unit" >{{target_ultrafiltration != '0'?"L":''}}</span>
-          <span v-if="this.$store.getters.user.template_info.template_id == 9 || this.$store.getters.user.template_info.template_id == 17 || this.$store.getters.user.template_info.template_id == 20 || this.$store.getters.user.template_info.template_id == 21 || this.$store.getters.user.template_info.template_id == 22 || this.$store.getters.user.template_info.template_id == 23 || this.$store.getters.user.template_info.template_id == 24 || this.$store.getters.user.template_info.template_id == 26 || this.$store.getters.user.template_info.template_id == 28 || this.$store.getters.user.template_info.org_id==9555 || this.$store.getters.user.template_info.template_id==27 || this.$store.getters.user.template_info.template_id == 30 || this.$store.getters.user.template_info.template_id == 32 || this.$store.getters.user.template_info.template_id == 38 || this.$store.getters.user.template_info.template_id == 40 || this.$store.getters.user.template_info.template_id == 43 || this.$store.getters.user.template_info.template_id == 45 || this.$store.getters.user.template_info.template_id == 46 || this.$store.getters.user.template_info.template_id == 48 || this.$store.getters.user.template_info.template_id == 56 || this.$store.getters.user.template_info.org_id==10395 || this.$store.getters.user.template_info.org_id ==10340  || this.$store.getters.user.template_info.template_id == 60 || this.$store.getters.user.template_info.org_id ==10430 || this.$store.getters.user.template_info.org_id ==10432  || this.$store.getters.user.template_info.org_id ==10441 || this.$store.getters.user.template_info.org_id ==10445 || this.$store.getters.user.template_info.org_id ==9829 || this.$store.getters.user.template_info.org_id ==10440 || this.$store.getters.user.template_info.org_id == 10469 ||  this.$store.getters.user.template_info.org_id == 10460 ||  this.$store.getters.user.template_info.org_id == 10644 ||  this.$store.getters.user.template_info.org_id == 10667 || this.$store.getters.user.template_info.org_id == 10723 || this.$store.getters.user.template_info.org_id == 10727" class="unit" >{{target_ultrafiltration != '0'?"ml":''}}</span>
+          <span v-if="this.$store.getters.user.template_info.template_id != 9 && this.$store.getters.user.template_info.template_id != 17 && this.$store.getters.user.template_info.template_id != 20 && this.$store.getters.user.template_info.template_id != 21 && this.$store.getters.user.template_info.template_id != 22 && this.$store.getters.user.template_info.template_id != 23 && this.$store.getters.user.template_info.template_id != 24 && this.$store.getters.user.template_info.template_id != 26 && this.$store.getters.user.template_info.template_id != 28 && this.$store.getters.user.template_info.org_id!=9555 && this.$store.getters.user.template_info.template_id != 27  && this.$store.getters.user.template_info.template_id != 30  && this.$store.getters.user.template_info.template_id != 32 && this.$store.getters.user.template_info.template_id != 38 && this.$store.getters.user.template_info.template_id != 40 && this.$store.getters.user.template_info.template_id != 43 && this.$store.getters.user.template_info.template_id != 45  && this.$store.getters.user.template_info.template_id != 46 && this.$store.getters.user.template_info.template_id != 48 && this.$store.getters.user.template_info.template_id != 56 &&  this.$store.getters.user.template_info.org_id!=10395 &&  this.$store.getters.user.template_info.org_id!=10340 && this.$store.getters.user.template_info.template_id != 60 &&  this.$store.getters.user.template_info.org_id!=10430 &&  this.$store.getters.user.template_info.org_id!=10432 &&  this.$store.getters.user.template_info.org_id!=10441 && this.$store.getters.user.template_info.org_id!=10445 && this.$store.getters.user.template_info.org_id!=9829 && this.$store.getters.user.template_info.org_id!=10440 && this.$store.getters.user.template_info.org_id!=10469 && this.$store.getters.user.template_info.org_id!=10460 && this.$store.getters.user.template_info.org_id!=10644 && this.$store.getters.user.template_info.org_id!=10667 && this.$store.getters.user.template_info.org_id!=10723&& this.$store.getters.user.template_info.org_id!=10727 && this.$store.getters.user.template_info.org_id!=10731" class="unit" >{{target_ultrafiltration != '0'?"L":''}}</span>
+          <span v-if="this.$store.getters.user.template_info.template_id == 9 || this.$store.getters.user.template_info.template_id == 17 || this.$store.getters.user.template_info.template_id == 20 || this.$store.getters.user.template_info.template_id == 21 || this.$store.getters.user.template_info.template_id == 22 || this.$store.getters.user.template_info.template_id == 23 || this.$store.getters.user.template_info.template_id == 24 || this.$store.getters.user.template_info.template_id == 26 || this.$store.getters.user.template_info.template_id == 28 || this.$store.getters.user.template_info.org_id==9555 || this.$store.getters.user.template_info.template_id==27 || this.$store.getters.user.template_info.template_id == 30 || this.$store.getters.user.template_info.template_id == 32 || this.$store.getters.user.template_info.template_id == 38 || this.$store.getters.user.template_info.template_id == 40 || this.$store.getters.user.template_info.template_id == 43 || this.$store.getters.user.template_info.template_id == 45 || this.$store.getters.user.template_info.template_id == 46 || this.$store.getters.user.template_info.template_id == 48 || this.$store.getters.user.template_info.template_id == 56 || this.$store.getters.user.template_info.org_id==10395 || this.$store.getters.user.template_info.org_id ==10340  || this.$store.getters.user.template_info.template_id == 60 || this.$store.getters.user.template_info.org_id ==10430 || this.$store.getters.user.template_info.org_id ==10432  || this.$store.getters.user.template_info.org_id ==10441 || this.$store.getters.user.template_info.org_id ==10445 || this.$store.getters.user.template_info.org_id ==9829 || this.$store.getters.user.template_info.org_id ==10440 || this.$store.getters.user.template_info.org_id == 10469 ||  this.$store.getters.user.template_info.org_id == 10460 ||  this.$store.getters.user.template_info.org_id == 10644 ||  this.$store.getters.user.template_info.org_id == 10667 || this.$store.getters.user.template_info.org_id == 10723 || this.$store.getters.user.template_info.org_id == 10727 || this.$store.getters.user.template_info.org_id == 10731" class="unit" >{{target_ultrafiltration != '0'?"ml":''}}</span>
           <!--<span-->
           <!--class="unit"-->
           <!--v-if="this.$store.getters.user.template_info.template_id == 6"-->

src/pages/patients/addPatient.vue

@@ -67,16 +67,37 @@
       <van-cell>
 
         <!-- 使用 title 插槽来自定义标题 -->
-        <template slot="title">
+        <!-- <template slot="title">
           <span class="custom-title">患者类型</span>
           <div style="width:60%;margin-left:2.2rem">
             <van-checkbox-group v-model="result" @change="changeMode">
               <van-checkbox name="1" shape="square">血透患者</van-checkbox>
               <van-checkbox name="2" shape="square">慢病患者</van-checkbox>
               <van-checkbox name="3" shape="square">会员患者</van-checkbox>
+              <van-checkbox name="4" shape="square">腹透患者</van-checkbox>
+              <van-checkbox name="5" shape="square">CKD患者</van-checkbox>
+              <van-checkbox name="6" shape="square">其他患者</van-checkbox>
             </van-checkbox-group>
           </div>
-        </template>
+        </template> -->
+
+        <van-cell>
+          <template slot="title">
+            <span class="custom-title">患者类型</span>
+            <div
+              style="width:60%;margin-left:1.3rem;display: flex;align-items: center;"
+            >
+              <van-radio-group v-model="patient_type">
+                <van-radio name="1" shape="square">血透患者</van-radio>
+                <van-radio name="2" shape="square">慢病患者</van-radio>
+                <van-radio name="3" shape="square">会员患者</van-radio>
+                <van-radio name="4" shape="square">腹透患者</van-radio>
+                <van-radio name="5" shape="square">CKD患者</van-radio>
+                <van-radio name="6" shape="square">其他患者</van-radio>
+              </van-radio-group>
+            </div>
+          </template>
+        </van-cell>
       </van-cell>
     </div>
 
@@ -447,7 +468,8 @@ export default {
         treatment_plan: ''
       },
       illnesslist: [],
-      showOne: false
+      showOne: false,
+      patient_type:1,
     }
   },
   methods: {
@@ -769,10 +791,10 @@ export default {
         return false
       }
 
-      if (this.result.length === 0) {
-        this.$toast('患者类型不能为空')
-        return false
-      }
+      // if (this.result.length === 0) {
+      //   this.$toast('患者类型不能为空')
+      //   return false
+      // }
       if (this.patientForm.dialysis === '' && this.result.indexOf('1') != -1) {
         this.$toast('透析号不能为空')
         return false
@@ -974,9 +996,24 @@ export default {
         is_infectious: this.patientForm.is_infectious,
         relative_phone: this.patientForm.relative_phone,
         remark: this.patientForm.remark,
-        treatment_plan: this.patientForm.treatment_plan
-      }
-      // console.log('params', params)
+        treatment_plan: this.patientForm.treatment_plan,
+        patient_type:parseInt(this.patient_type),
+      }
+    
+      
+      if(params.lapseto >0){
+        params.lapseto = parseInt(params.lapseto)
+      }else{
+        params.lapseto = parseInt(params.lapseto)
+      }
+      params.treatmentMethod = 1
+
+      // if(params.treatmentMethod >0){
+      //   params.treatmentMethod = parseInt(params.treatmentMethod)?parseInt(params.treatmentMethod):0
+      // }else{
+      //   params.treatmentMethod = parseInt(params.treatmentMethod)?parseInt(params.treatmentMethod):0
+      // }
+      console.log('params', params)
 
       savePatient(params).then(response => {
         if (response.data.state === 1) {

src/pages/patients/editPatient.vue

@@ -87,8 +87,8 @@
           :readonly="readonly"
           placeholder="请输入家庭地址"
         />
-      <van-cell>
-        <!-- 使用 title 插槽来自定义标题 -->
+      <!-- <van-cell>
+     
         <template slot="title">
           <span class="custom-title">患者类型</span>
           <div style="width:60%;margin-left:2rem">
@@ -102,10 +102,37 @@
               <van-checkbox name="3" shape="square" @click="changeMode"
                 >会员患者</van-checkbox
               >
+              <van-checkbox name="4" shape="square" @click="changeMode"
+                >腹透患者</van-checkbox
+              >
+              <van-checkbox name="5" shape="square" @click="changeMode"
+                >CKD患者</van-checkbox
+              >
+              <van-checkbox name="6" shape="square" @click="changeMode"
+                >其他患者</van-checkbox
+              >
             </van-checkbox-group>
           </div>
         </template>
-      </van-cell>
+      </van-cell> -->
+
+      <van-cell>
+          <template slot="title">
+            <span class="custom-title">患者类型</span>
+            <div
+              style="width:60%;margin-left:1.3rem;display: flex;align-items: center;"
+            >
+              <van-radio-group v-model="patient_type">
+                <van-radio name="1" shape="square">血透患者</van-radio>
+                <van-radio name="2" shape="square">慢病患者</van-radio>
+                <van-radio name="3" shape="square">会员患者</van-radio>
+                <van-radio name="4" shape="square">腹透患者</van-radio>
+                <van-radio name="5" shape="square">CKD患者</van-radio>
+                <van-radio name="6" shape="square">其他患者</van-radio>
+              </van-radio-group>
+            </div>
+          </template>
+        </van-cell>
       <van-cell class="upfileCell">
         <!-- 使用 title 插槽来自定义标题 -->
         <template slot="title">
@@ -564,7 +591,9 @@ export default {
       centerDialogVisible: false,
       loading: false,
       uploadAvatar: '',
-      showDeath: false
+      showDeath: false,
+      patient_type:"",
+
     }
   },
   methods: {
@@ -942,6 +971,9 @@ export default {
           this.patientForm.death_time = uParseTimeOne(patientdetail.death_time, '{y}-{m}-{d}')
           this.patientForm.out_reason = patientdetail.out_reason
           this.patientForm.treatment_plan = patientdetail.treatment_plan
+          this.patient_type = patientdetail.patient_type.toString()
+          console.log("类型===================",this.patient_type)
+          
         }
       })
     },
@@ -1292,7 +1324,8 @@ export default {
         out_reason: this.patientForm.out_reason,
         relative_phone: this.patientForm.relative_phone,
         remark: this.patientForm.remark,
-        treatment_plan: this.patientForm.treatment_plan
+        treatment_plan: this.patientForm.treatment_plan,
+        patient_type:parseInt(this.patient_type),
       }
 
       updatedPatient(params).then(response => {