新化需求

src/api/common/common.js

@@ -90,7 +90,7 @@ export function getPrescriptionList (startime, endtime, limit, page) {
   }
   console.log('parasm', params)
   return request({
-    url: '/m/api/getprescriptionlist',
+    url: '/m/api/getprescriptionlist/one',
     method: 'get',
     params: params
   })

src/api/dialysis.js

@@ -396,6 +396,14 @@ export function getMobilePrintStockGood (params) {
   })
 }
 
+export function getPrescriptionList(params){
+  return request({
+    url:"/m/api/getprescriptionlist",
+    method:"get",
+    params:params
+  })
+}  
+
 export function batchDeleteMonitor (params) {
   return request({
     url: '/m/api/batchdeletemonitor',

src/pages/dqc/components/dialysisStatisticsPersonal.vue

@@ -156,6 +156,7 @@ export default {
       getMobilePatientDetial(id, this.startTime, this.endTime, this.listQuery.limit, this.listQuery.page).then(response => {
         if (response.data.state === 1) {
           var patients = response.data.data.patients
+          console.log("patients",patients)
           this.isStop = true
           this.getModeId(patients)
           var hash = {}
@@ -253,7 +254,7 @@ export default {
             var totallist = response.data.data.totallist
             // console.log('totallist', totallist)
             var prescriptionList = response.data.data.prescriptionList
-            // console.log("prescription",prescriptionList)
+            console.log("prescription",prescriptionList)
             // console.log('prescriptionList', prescriptionList)
             this.getModeId(prescriptionList)
             var modeIdCount = response.data.data.modeIdCount
@@ -398,65 +399,68 @@ export default {
     },
     // 转透析模式id
     getModeId (patients) {
-      for (let i = 0; i < patients.length; i++) {
-        if (patients[i].mode_id == 1) {
-          patients[i].mode_id = 'HD'
-        } else if (patients[i].mode_id == 2) {
-          patients[i].mode_id = 'HDF'
-        } else if (patients[i].mode_id == 3) {
-          patients[i].mode_id = 'HD+HP'
-        } else if (patients[i].mode_id == 4) {
-          patients[i].mode_id = 'HP'
-        } else if (patients[i].mode_id == 5) {
-          patients[i].mode_id = 'HF'
-        } else if (patients[i].mode_id == 6) {
-          patients[i].mode_id = 'SCUF'
-        } else if (patients[i].mode_id == 7) {
-          patients[i].mode_id = 'IUF'
-        } else if (patients[i].mode_id == 8) {
-          patients[i].mode_id = 'HFHD'
-        } else if (patients[i].mode_id == 9) {
-          patients[i].mode_id = 'HFHD+HP'
-        } else if (patients[i].mode_id == 10) {
-          patients[i].mode_id = 'PHF'
-        } else if (patients[i].mode_id == 11) {
-          patients[i].mode_id = 'HFR'
-        } else if (patients[i].mode_id == 12) {
-          patients[i].mode_id = 'HDF+HP'
-        } else if (patients[i].mode_id == 13) {
-          patients[i].mode_id = 'CRRT'
-        } else if (patients[i].mode_id == 14) {
-          patients[i].mode_id = '腹水回输'
-        } else if (patients[i].mode_id == 15) {
-          patients[i].mode_id = 'HD前置换'
-        } else if (patients[i].mode_id == 16) {
-          patients[i].mode_id = 'HD后置换'
-        } else if (patients[i].mode_id == 17) {
-          patients[i].mode_id = 'HDF前置换'
-        } else if (patients[i].mode_id == 18) {
-          patients[i].mode_id = 'HDF后置换'
-        } else if (patients[i].mode_id == 19) {
-          patients[i].mode_id = 'IUF+HD'
-        } else if (patients[i].mode_id == 24) {
-          patients[i].mode_id = 'I-HDF'
-        } else if (patients[i].mode_id == 25) {
-          patients[i].mode_id = 'HD高通'
-        } else if (patients[i].mode_id == 26) {
-          patients[i].mode_id = 'CVVH'
-        } else if (patients[i].mode_id == 27) {
-          patients[i].mode_id = 'CVVHD'
-        } else if (patients[i].mode_id == 28) {
-          patients[i].mode_id = 'CVVHDF'
-        } else if (patients[i].mode_id == 29) {
-          patients[i].mode_id = 'PE'
-        } else if (patients[i].mode_id == 30) {
-          patients[i].mode_id = '血浆胆红素吸附+HP'
-        } else if (patients[i].mode_id == 31) {
-          patients[i].mode_id = 'HPD'
-        } else if (patients[i].mode_id == 32) {
-          patients[i].mode_id = 'HDP'
+      if(patients!=null && patients.length>0){
+       for (let i = 0; i < patients.length; i++) {
+          if (patients[i].mode_id == 1) {
+            patients[i].mode_id = 'HD'
+          } else if (patients[i].mode_id == 2) {
+            patients[i].mode_id = 'HDF'
+          } else if (patients[i].mode_id == 3) {
+            patients[i].mode_id = 'HD+HP'
+          } else if (patients[i].mode_id == 4) {
+            patients[i].mode_id = 'HP'
+          } else if (patients[i].mode_id == 5) {
+            patients[i].mode_id = 'HF'
+          } else if (patients[i].mode_id == 6) {
+            patients[i].mode_id = 'SCUF'
+          } else if (patients[i].mode_id == 7) {
+            patients[i].mode_id = 'IUF'
+          } else if (patients[i].mode_id == 8) {
+            patients[i].mode_id = 'HFHD'
+          } else if (patients[i].mode_id == 9) {
+            patients[i].mode_id = 'HFHD+HP'
+          } else if (patients[i].mode_id == 10) {
+            patients[i].mode_id = 'PHF'
+          } else if (patients[i].mode_id == 11) {
+            patients[i].mode_id = 'HFR'
+          } else if (patients[i].mode_id == 12) {
+            patients[i].mode_id = 'HDF+HP'
+          } else if (patients[i].mode_id == 13) {
+            patients[i].mode_id = 'CRRT'
+          } else if (patients[i].mode_id == 14) {
+            patients[i].mode_id = '腹水回输'
+          } else if (patients[i].mode_id == 15) {
+            patients[i].mode_id = 'HD前置换'
+          } else if (patients[i].mode_id == 16) {
+            patients[i].mode_id = 'HD后置换'
+          } else if (patients[i].mode_id == 17) {
+            patients[i].mode_id = 'HDF前置换'
+          } else if (patients[i].mode_id == 18) {
+            patients[i].mode_id = 'HDF后置换'
+          } else if (patients[i].mode_id == 19) {
+            patients[i].mode_id = 'IUF+HD'
+          } else if (patients[i].mode_id == 24) {
+            patients[i].mode_id = 'I-HDF'
+          } else if (patients[i].mode_id == 25) {
+            patients[i].mode_id = 'HD高通'
+          } else if (patients[i].mode_id == 26) {
+            patients[i].mode_id = 'CVVH'
+          } else if (patients[i].mode_id == 27) {
+            patients[i].mode_id = 'CVVHD'
+          } else if (patients[i].mode_id == 28) {
+            patients[i].mode_id = 'CVVHDF'
+          } else if (patients[i].mode_id == 29) {
+            patients[i].mode_id = 'PE'
+          } else if (patients[i].mode_id == 30) {
+            patients[i].mode_id = '血浆胆红素吸附+HP'
+          } else if (patients[i].mode_id == 31) {
+            patients[i].mode_id = 'HPD'
+          } else if (patients[i].mode_id == 32) {
+            patients[i].mode_id = 'HDP'
+          }
         }
       }
+    
     },
     // 获取年龄
     getAge (UUserCard) {
@@ -497,9 +501,13 @@ export default {
           var totallist = response.data.data.totallist
           var prescriptionList = response.data.data.prescriptionList
           // console.log('prescriptionList', prescriptionList)
-          this.getModeId(prescriptionList)
+          if(prescriptionList!=null && prescriptionList.length>0){
+            this.getModeId(prescriptionList)
+          }
+         
           var modeIdCount = response.data.data.modeIdCount
-          for (let i = 0; i < modeIdCount.length; i++) {
+          if(modeIdCount!=null && modeIdCount.length>0){
+            for (let i = 0; i < modeIdCount.length; i++) {
             if (modeIdCount[i].mode_id == 1) {
               modeIdCount[i].mode_id = 'HD'
             }
@@ -596,7 +604,9 @@ export default {
             if (modeIdCount[i].mode_id == 32) {
               modeIdCount[i].mode_id = 'HDP'
             }
+            }
           }
+       
           this.modeIdCount = modeIdCount
           let dataInfo = {}
           list.forEach((item, index) => {

src/pages/main/DetailsPage.vue

@@ -171,7 +171,7 @@
     </van-popup>
     </div>
     <!-- :min-date="minDate" :max-date="maxDate" -->
-    <van-calendar class="calendarPopup" v-model="calendarShow" @confirm="onCalendar" :min-date="minDate" :max-date="maxDate"  :formatter="formatter" :show-confirm='false' />
+    <van-calendar class="calendarPopup" v-model="calendarShow" @confirm="onCalendar" :min-date="minDate"  :formatter="formatter" :show-confirm='false' />
 
   </div>
 </template>
@@ -700,8 +700,8 @@ export default {
       }
     },
     GetPatientInfoWithDiseases (id) {
-      GetPatientInfoWithDiseases(id)
-        .then(response => {
+       
+      GetPatientInfoWithDiseases(id).then(response => {
           if (response.data.state == 1) {
             this.patient = response.data.data.patient
           } else {
@@ -1150,16 +1150,26 @@ export default {
     },
     formatter (day) {
       this.patientAllDayList.map(item => {
-        if (item.dialysis_date == new Date(day.date).getTime() / 1000) {
-          day.bottomInfo = item.schedual_type == 1 ? '上午' : item.schedual_type == 2 ? '下午' : item.schedual_type == 3 ? '晚上' : ''
+       
+       if (item.schedule_date == new Date(day.date).getTime() / 1000) {
+          day.bottomInfo = item.schedule_type == 1 ? '上午' : item.schedule_type == 2 ? '下午' : item.schedule_type == 3 ? '晚上' : ''
           day.topInfo = this.GetModeByModeId(item.mode_id)
         }
+        
+        
       })
       return day
     },
     getPatientDialysisRecord () {
       let patient_id = this.patient_id
-      getPatientDialysisRecord({id: patient_id}).then((res) => {
+      //某月第一天
+      // let startTime = moment().startOf('months').format('YYYY-MM-DD')
+      let startTime =  moment().month(moment().month() - 6).startOf('month').format('YYYY-MM-DD')
+        //某月最后一天
+      let endTime = moment().month(moment().month() +1).endOf('month').format('YYYY-MM-DD')
+
+      console.log("开始时间",startTime,endTime)
+      getPatientDialysisRecord({id: patient_id,start_time:startTime,end_time:endTime}).then((res) => {
         console.log('resres', res)
         let list = res.data.data.list
         this.patientAllDayList = list
@@ -1180,7 +1190,7 @@ export default {
     },
     onCalendar (val) {
       this.patientAllDayList.map(item => {
-        if (item.dialysis_date == new Date(val).getTime() / 1000) {
+          if (item.schedule_date == new Date(val).getTime() / 1000) {
           this.reload()
           this.$router.replace({
             path: '/details',
@@ -1193,6 +1203,8 @@ export default {
           // sessionStorage.removeItem('newBarIndex')
           this.calendarShow = false
         }
+        
+       
       })
     },
     openCalendarShow () {

src/pages/main/DialysisArea.vue

@@ -679,10 +679,32 @@ export default {
                 }
               }
             }
-            // console.log('scheduals323223323232233232', scheduals)
+        
 
             let schedualsLength = scheduals.length
+            if(scheduals!=null&&scheduals.length>0){
+              var arr = []
+              var arrTwo = []
+              var arrThree = []
+               for(let i=0;i<scheduals.length;i++){
+                 if(scheduals[i].schedule_type == 1){
+                    arr.push(scheduals[i])
+                 }
+                 if(scheduals[i].schedule_type == 2){
+                  arrTwo.push(scheduals[i])
+                 }
+                 if(scheduals[i].schedule_type == 3){
+                  arrThree.push(scheduals[i])
+                 }
+               }
+               sessionStorage.setItem('schedualsOneLength', arr.length)
+               sessionStorage.setItem('schedualsTwoLength', arrTwo.length)
+               sessionStorage.setItem('schedualsThreeLength', arrThree.length)
+            }
             sessionStorage.setItem('schedualsLength', schedualsLength)
+
+          
+            
             this.schedualsLength = schedualsLength
             this.$store.dispatch('SetScheduals', { scheduals: scheduals })
             this.$store.dispatch('SetWaitScheduals', { waitscheduals: scheduals })

src/pages/main/RecordPage.vue

@@ -75,9 +75,9 @@
       <van-tab title="透析医嘱">
         <dialysis-advice-table v-if="index == 3"></dialysis-advice-table>
       </van-tab>
-      <!-- <van-tab title="病历质控">
+      <van-tab title="病历质控">
         <control v-if="index == 4" ref='control' :search_keyword="search_keyword"></control>
-      </van-tab> -->
+      </van-tab>
 
       <van-tab title="耗材药品">
         <before-dialysis  v-if="index ==5" ref="dialysisParameters"  :search_keyword="search_keyword"></before-dialysis>
@@ -158,7 +158,7 @@ import { getDialysisScheduals, getWaitingScheduals } from '@/api/dialysis'
 import { parseTime } from '@/utils/index'
 import { getDialysisOrWaitSelectedConfig } from '@/utils/data_config'
 import monitoring from '../monitoring/index'
-// import control from '../control/index.vue'
+import control from '../control/index.vue'
 import DialysisAdviceTable from '../advice/DialysisAdviceTable'
 import DialysisAdvice from '../advice/DialysiAdive.vue'
 import beforeDialysis from './beforeDialysis/index'
@@ -253,7 +253,7 @@ export default {
     beforeDialysis,
     calling,
     schedule,
-    // control
+    control
     // Group,
     // Cell
   },

src/pages/main/WaitingArea.vue

@@ -86,7 +86,7 @@
         </ul>
       </div>
       <div class="stateBox" ref="waitScroll">
-        <div style="margin-top:10px;">今日排班总人数：{{ schedualsLength }}人</div>
+        <div style="margin-top:10px;">今日排班总人数：{{ schedualsLength }}人 上午:{{ schedualsLengthOne }}人 下午:{{ schedualsLengthTwo }}人 晚上:{{ schedualsLengthThree }}人</div>
         <!-- <patient-box class="clearfix" :patients="filtedScheduals "></patient-box> -->
         <div v-for="(item, index) in allPatient" :key="index">
           <h2 class="title" v-if='patient_selected != 2'>{{ item.zone_name }}</h2>
@@ -215,6 +215,9 @@ export default {
       information: [],
       deviceTypeList:[],
       schedualsLength: 0,
+      schedualsLengthOne:0,
+      schedualsLengthTwo:0,
+      schedualsLengthThree:0,
       zonesList: [],
       zoneMap: {}
     }
@@ -674,6 +677,15 @@ export default {
       if (sessionStorage.getItem('schedualsLength')) {
         this.schedualsLength = Number(sessionStorage.getItem('schedualsLength'))
       }
+      if (sessionStorage.getItem('schedualsOneLength')) {
+        this.schedualsLengthOne = Number(sessionStorage.getItem('schedualsOneLength'))
+      }
+      if (sessionStorage.getItem('schedualsTwoLength')) {
+        this.schedualsLengthTwo = Number(sessionStorage.getItem('schedualsTwoLength'))
+      }
+      if (sessionStorage.getItem('schedualsThreeLength')) {
+        this.schedualsLengthThree = Number(sessionStorage.getItem('schedualsThreeLength'))
+      }
     },
     websocketSend (data) {
       try {
@@ -969,7 +981,7 @@ export default {
       this.getDataTwo()
     },
     handleTimeChange: function (index) {
-      console.log('indesx222222', index)
+     
       let obj = {
         cmd: 'queue/join',
         data: {type: 3, page: 0, size: 0}
@@ -1190,7 +1202,7 @@ export default {
         arr2 = arr
       }
       console.log('机构ID', this.$store.getters.user.template_info.org_id)
-      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 ||  this.$store.getters.user.template_info.org_id == 10340) {
+      if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 ||  this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587) {
         console.log('进来23323223233223')
         arr2.map(item => {
           item.scheduals.map(it => {
@@ -1254,6 +1266,8 @@ export default {
         if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 ||  this.$store.getters.user.template_info.org_id == 10340) {
           arr4[0].scheduals.sort(this.compareOne('sort'))
         }
+        console.log("arr4[0]", arr4[0])
+       
         this.allPatient = arr4
         console.log('arr4', arr4)
       } else {
@@ -1274,6 +1288,7 @@ export default {
     },
 
     getDataOne (index) {
+      console.log("寄哪里地我哦我我",this.patient_selected)
       this.menuList[1].count = 0
       let patientArr = this.zone_scheduals
 
@@ -1285,6 +1300,10 @@ export default {
       zones = zones.sort(function (a, b) {
         return a.value > b.value
       })
+       console.log("this.zone_scheduals",this.zone_scheduals)
+     
+     
+     
       if (index > 0) {
         var total = 0
         for (let i = 0; i < this.zone_scheduals.length; i++) {
@@ -1309,7 +1328,7 @@ export default {
             }
           }
         }
-        console.log('zones', zones)
+        console.log('zones232332233', zones)
         this.zone_options = []
         this.zone_options = zones
       } else {
@@ -1336,7 +1355,7 @@ export default {
             }
           }
         }
-        console.log('zones', zones)
+        console.log('zones9999999999999999', zones)
         this.zone_options = []
         this.zone_options = zones
       }
@@ -1355,12 +1374,14 @@ export default {
             }
           }
         }
+        console.log("arrwoowowowow",arr)
         arr1 = arr
       }
 
       let arr2 = []
       if (this.patient_selected == 0) {
         arr2 = JSON.parse(JSON.stringify(arr1))
+        console.log("arr2owoowowowowowowowo",arr2)
       } else if (this.patient_selected == 1) {
         let arr = JSON.parse(JSON.stringify(arr1))
         for (let i = 0; i < arr.length; i++) {
@@ -1428,16 +1449,30 @@ export default {
           item.created_time = item.assessment_before_dislysis.created_time
           item.sort = item.device_number.sort
         })
-        if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 && this.$store.getters.user.template_info.org_id != 10340) {
+        if (this.$store.getters.user.template_info.org_id != 10346 && this.$store.getters.user.template_info.org_id != 10490 && this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 10579 && this.$store.getters.user.template_info.org_id != 10587) {
           arr4[0].scheduals.sort(this.compare('created_time'))
         }
 
-        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340) {
+        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587) {
           arr4[0].scheduals.sort(this.compareOne('sort'))
         }
         this.allPatient = arr4
         console.log('arr4', arr4)
       } else {
+        console.log('arr6666666666666666666', arr4)
+        arr4.map((item, index) => {
+          if (index != 0) {
+            arr4[0].scheduals.push(...arr4[index].scheduals)
+            arr4[index].scheduals = []
+          }
+        })
+        arr4[0].scheduals.map(item => {
+          item.sort = item.device_number.sort
+        })
+       
+        if (this.$store.getters.user.template_info.org_id == 10346 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10340  || this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587) {
+          arr4[0].scheduals.sort(this.compareOne('sort'))
+        }
         this.allPatient = arr4
       }
 
@@ -1473,9 +1508,13 @@ export default {
         var scheduals = []
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index]
-          if (schedual.patient.name.indexOf(search_keyword) != -1 || schedual.patient.dialysis_no.indexOf(search_keyword) != -1) {
-            scheduals.push(schedual)
+          console.log("schedual.patient.name",schedual.patient)
+          if(schedual.patient!=null && schedual.patient.name!=undefined){
+            if (schedual.patient.name.indexOf(search_keyword) != -1 || schedual.patient.dialysis_no.indexOf(search_keyword) != -1) {
+              scheduals.push(schedual)
+            }
           }
+        
         }
         this.allPatient = this.processScheduals(scheduals)
       } else {
@@ -1484,6 +1523,7 @@ export default {
     },
 
     getDataTwo () {
+      console.log("patient_selected",this.patient_selected)
       this.menuList[1].count = 0
       let patientArr = this.zone_scheduals
 
@@ -1537,9 +1577,7 @@ export default {
         arr3 = JSON.parse(JSON.stringify(arr2))
       } else {
         let arr = JSON.parse(JSON.stringify(arr2))
-        console.log('灭国2332332323', arr)
-        console.log('this.zone_options[this.zone_selected].text', this.zone_options[this.zone_selected].text)
-        console.log('this.zone_options[this.zone_selected].zone_name', this.zone_options[this.zone_selected].zone_name)
+       
         for (let i = 0; i < arr.length; i++) {
           if (this.zone_options[this.zone_selected].zone_name != arr[i].zone_name) {
             // 删除元素后改变i的值

src/pages/main/beforeDialysis/components/consumables.vue

@@ -3,8 +3,9 @@
     <div class="consumableList">
       <van-list v-if="list.length > 0">
         <div class="consumableListOne" v-for="(item,index) in list" :key="index">
-          <p v-for="subItem,index in item.good_type" :key="index">{{subItem.id == 0? subItem.name:subItem.name+": "}}
-            <span style="color:#258ffc">{{ getGoodUserInfo(subItem.id,item.good_user,item.last_good_user, item.good_user_detail,item.last_good_user_detail) }}</span>
+          <p v-for="subItem,index in item.good_type" :key="index">
+            {{subItem.id == 0? subItem.name:subItem.name+": "}}
+            <span style="color:#258ffc">{{ getGoodUserInfo(subItem.id,item.good_user,item.last_good_user, item.good_user_detail,item.last_good_user_detail,item.prescription) }}</span>
           </p>
 
         </div>
@@ -35,7 +36,9 @@
       }
     },
     methods: {
-      getGoodUserInfo(good_type_id, good_user, last_good_user, good_user_detail, last_good_user_detail) {
+      getGoodUserInfo(good_type_id, good_user, last_good_user, good_user_detail, last_good_user_detail,prescription) {
+        console.log("good_type_id",good_type_id)
+        
         if (good_user != null && good_user.length > 0) {
           let desc = ""
           for (let b = 0; b < good_user.length; b++) {
@@ -54,8 +57,29 @@
           //
           //   }
           //   return ""
+        }else{
+          if(good_type_id == 9741){
+            return prescription.dialysis_dialyszers
+          }
+          if(good_type_id == 9742){
+            return  prescription.dialysis_irrigation
+          }
+
+          if(good_type_id == 9743){
+            return prescription.dialysis_strainer
+          }
+          if(good_type_id ==9748){
+            return prescription.dialysis_dialyszers
+          }
+          if(good_type_id ==9749){
+            return prescription.dialysis_irrigation
+          }
+          if(good_type_id ==9750){
+            return prescription.dialysis_strainer
+          }
+          
         }
-        return ""
+        
       },
       // GetDialysisGoods() {
       //   var newDate = new Date();
@@ -158,7 +182,12 @@
         }, 1000);
       },
       toDetail() {
-        this.$router.push("/consumablesDetail");
+        if(this.$store.getters.user.template_info.org_id != 10579 && this.$store.getters.user.template_info.org_id != 10587){
+          this.$router.push("/consumablesDetail");
+        }else{
+          this.$router.push("/consumablesDetailOne");
+        }
+       
       }
     },
     created() {

src/pages/main/beforeDialysis/index.vue

@@ -277,7 +277,9 @@
                 "last_good_user":res.data.dialysis_goods[i].last_good_user,
                 "good_user_detail":res.data.dialysis_goods[i].good_user_detail,
                 "last_good_user_detail":res.data.dialysis_goods[i].last_good_user_detail,
+                "prescription":res.data.dialysis_goods[i].prescription
               }
+              console.log("几哪来的哦我饿哦饿哦问哦饿哦",this.list)
               this.list.push(newObj)
               console.log(this.list)
 

src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue

@@ -421,8 +421,19 @@ export default {
               this.advice_start_time = year + '-' + month + '-' + day + ' ' + '15:00'
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+          } else if (this.$store.getters.user.org.id == 10580) {
+            if (sch.schedule_type == 1) {
+              this.advice_start_time = year + '-' + month + '-' + day + ' ' + '07:00'
+              this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
+            } else if (sch.schedule_type == 2) {
+              this.advice_start_time = year + '-' + month + '-' + day + ' ' + '10:30'
+              this.start_time = year + '-' + month + '-' + day + ' ' + '10:30'
+            } else if (sch.schedule_type == 3) {
+              this.advice_start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+              this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+            }
           } else {
-            if (this.$store.getters.user.org.id == 10016 || this.$store.getters.user.org.id == 10013 || this.$store.getters.user.org.id == 10014 || this.$store.getters.user.org.id == 10121) {
+            if (this.$store.getters.user.org.id == 10016 || this.$store.getters.user.org.id == 10013 || this.$store.getters.user.org.id == 10014 || this.$store.getters.user.org.id == 10121 || this.$store.getters.user.org.id == 10587) {
               var nowDate = new Date()
               var nowYear = nowDate.getFullYear()
               var nowMonth = nowDate.getMonth() + 1

src/pages/main/newActionBar/assessmentAfter.vue

@@ -715,6 +715,7 @@ export default {
     } else {
       this.formValue.weight_loss = this.record.weight_loss
     }
+
     console.log('this.formValue.weight_loss', this.formValue.weight_loss)
     console.log('this.record.weight_loss', this.record.weight_loss)
 
@@ -723,6 +724,9 @@ export default {
       if(this.$store.getters.user.template_info.org_id==9829){
         this.formValue.pulse_frequency= 80
       }
+      // if(this.$store.getters.user.template_info.org_id==10580){
+      //   this.formValue.actual_ultrafiltration = this.record.weight_loss*1000
+      // }
       if(this.$route.query.patient_id ==18695){
           this.formValue.actual_displacement = 0
       }

src/pages/main/newActionBar/components/adviceTemplate.vue

@@ -118,7 +118,7 @@ export default {
       } else {
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
       }
-    } else if (this.$store.getters.user.org.id == 9671 || this.$store.getters.user.org.id == 9675 || this.$store.getters.user.org.id == 10340) {
+    } else if (this.$store.getters.user.org.id == 9671 || this.$store.getters.user.org.id == 9675 || this.$store.getters.user.org.id == 10340 ) {
       var date = new Date()
       var year = date.getFullYear() // 获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 // 获取当前月份(0-11,0代表1月)
@@ -152,6 +152,23 @@ export default {
         this.start_time = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
       }
       
+    }else if (this.$store.getters.user.org.id == 10580) {
+      var date = new Date()
+      var year = date.getFullYear() // 获取完整的年份(4位)
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 // 获取当前月份(0-11,0代表1月)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() // 获取当前日(1-31)
+
+      if (this.schedulePatient.schedule_type == 1) {
+        this.start_time_str = year + '-' + month + '-' + day + ' ' + '07:00' + ':00'
+        this.start_time = year + '-' + month + '-' + day + ' ' + '07:00' + ':00'
+      } else if (this.schedulePatient.schedule_type == 2) {
+        this.start_time_str = year + '-' + month + '-' + day + ' ' + '10:30' + ':00'
+        this.start_time = year + '-' + month + '-' + day + ' ' + '10:30' + ':00'
+      } else if (this.schedulePatient.schedule_type == 3) {
+        this.start_time_str = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
+        this.start_time = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
+      }
+      
     }else if (this.$store.getters.user.org.id == 10234) {
       var date = new Date()
       var year = date.getFullYear() // 获取完整的年份(4位)
@@ -169,6 +186,8 @@ export default {
         this.start_time = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
       }
       
+    }else if (this.$store.getters.user.org.id == 10587) {
+      this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
     } else {
       this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
     }

src/pages/main/newActionBar/components/newAddOrder.vue

@@ -288,7 +288,7 @@ export default {
       } else {
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
       }
-    } else if (this.$store.getters.user.org.id == 9671 || this.$store.getters.user.org.id == 9675 || this.$store.getters.user.org.id == 10340 || this.$store.getters.user.org.id == 10447 ) {
+    } else if (this.$store.getters.user.org.id == 9671 || this.$store.getters.user.org.id == 9675 || this.$store.getters.user.org.id == 10340 || this.$store.getters.user.org.id == 10447) {
       var date = new Date()
       var year = date.getFullYear() // 获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 // 获取当前月份(0-11,0代表1月)
@@ -320,6 +320,22 @@ export default {
         this.start_time_str = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
         this.start_time = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
       }
+    }else if (this.$store.getters.user.org.id == 10580) {
+      var date = new Date()
+      var year = date.getFullYear() // 获取完整的年份(4位)
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 // 获取当前月份(0-11,0代表1月)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() // 获取当前日(1-31)
+
+      if (this.schedulePatient.schedule_type == 1) {
+        this.start_time_str = year + '-' + month + '-' + day + ' ' + '07:00' + ':00'
+        this.start_time = year + '-' + month + '-' + day + ' ' + '07:00' + ':00'
+      } else if (this.schedulePatient.schedule_type == 2) {
+        this.start_time_str = year + '-' + month + '-' + day + ' ' + '10:30' + ':00'
+        this.start_time = year + '-' + month + '-' + day + ' ' + '10:30' + ':00'
+      } else if (this.schedulePatient.schedule_type == 3) {
+        this.start_time_str = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
+        this.start_time = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
+      }
     }else if (this.$store.getters.user.org.id == 10234) {
       var date = new Date()
       var year = date.getFullYear() // 获取完整的年份(4位)
@@ -336,6 +352,8 @@ export default {
         this.start_time_str = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
         this.start_time = year + '-' + month + '-' + day + ' ' + '15:30' + ':00'
       }
+    }else if (this.$store.getters.user.org.id == 10587){
+      this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
     } else {
       this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
     }
@@ -383,16 +401,36 @@ export default {
       cb(results)
     },
     createFilter (queryString) {
+     
       return (restaurant) => {
-        return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        console.log("restaurant23223232323",restaurant)
+        return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) !=-1)
       }
     },
+    getUnits(id){
+     console.log("drug_spec_unit_options",this.drug_spec_unit_options)
+     var name = ""
+      for(let i=0;i<this.drug_spec_unit_options.length;i++){
+        if(id == this.drug_spec_unit_options[i].id){
+           name = this.drug_spec_unit_options[i].name
+        }
+      }
+      return name
+    },
     handleSelect (item) {
       this.drug_id = item.id
       this.way = 1
-      console.log('itme2222222222', item)
+      console.log('itme33333333', item)
       this.current_drug_name = name
-      this.order.advice_desc = ''
+      var specai_name = item.drug_specs[0].dose + item.drug_specs[0].dose_unit +"*" +item.drug_specs[0].min_number + item.drug_specs[0].min_unit +"/" + item.drug_specs[0].max_unit
+      this.order.advice_desc = specai_name
+      this.order.drug_spec_unit = item.drug_specs[0].min_unit
+      this.order.prescribing_number = item.drug_specs[0].prescribing_number
+      this.order.prescribing_number_unit = item.drug_specs[0].prescribing_number_unit
+      this.order.single_dose = item.drug_specs[0].single_dose
+      this.order.single_dose_unit =this.getUnits(item.drug_specs[0].drug_dose_unit) 
+      this.order.delivery_way  = item.drug_specs[0].delivery_way
+      this.order.execution_frequency = item.drug_specs[0].execution_frequency
       this.drugSpec = []
       for (let i = 0; i < this.all_drug.length; i++) {
         if (this.all_drug[i].drug_name == item.drug_name) {
@@ -426,6 +464,7 @@ export default {
       }
     },
     handleSelect1 (item) {
+      console.log("itemwowoowowoow",item)
       for (let i = 0; i < this.drugSpec.length; i++) {
         if (this.drugSpec[i].drug_spec == item.drug_spec) {
           this.order.advice_desc = this.drugSpec[i].drug_spec

src/pages/main/newActionBar/consumables.vue

@@ -80,6 +80,10 @@ export default {
       settle_open: 0
     }
   },
+  created(){
+    console.log("is_openwowowowowow",this.is_open)
+
+  },
   methods: {
     stockOut () {
       this.loading = true
@@ -522,8 +526,7 @@ export default {
             }
           }
 
-          console.log("newArr-----------------",newArr)
-          console.log("is_open----------------",this.is_open)
+        
           // 判断是否出库
           if(newArr!=null && newArr.length >0){
              var total_one = 0
@@ -546,11 +549,13 @@ export default {
           console.log("listowowowoowowowowowowowowo",this.list)
 
           if (outConfig.is_open == 1) {
-            this.list = []
+            this.isShowButton =1
+            this.is_open =1
+            //this.list = []
           }
 
           if (settleConfig.is_open == 1) {
-            this.list = []
+             this.list = []
           }
         }
       }

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -86,16 +86,19 @@
               predialysis.dry_weight ? predialysis.dry_weight : "--"
             }}Kg</span
           >
-          <span
-            >衣物重：{{
+          <span v-if="$store.getters.user.template_info.org_id !=10599">衣物重：{{
               predialysis.additional_weight
                 ? predialysis.additional_weight
                 : "--"
             }}Kg</span></br>
-          <span v-if="last_record!=undefined">上次透后体重：{{last_record.weight_after?last_record.weight_after: "--"}}Kg</span></br>
+          <span v-if="last_record!=undefined && $store.getters.user.template_info.org_id !=10599">上次透后体重：{{last_record.weight_after?last_record.weight_after: "--"}}Kg</span></br>
 
           <span v-if="$store.getters.user.template_info.org_id == 10551 &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined && dialysisPrescription.target_ultrafiltration>0">目标脱水量百分比:{{ (((dialysisPrescription.target_ultrafiltration)/predialysis.dry_weight)*100).toFixed(2)  }}%</span>
           <span v-if="$store.getters.user.template_info.org_id == 10249 &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined && dialysisPrescription.target_ultrafiltration>0">目标脱水量百分比:{{ (((dialysisPrescription.target_ultrafiltration/1000)/predialysis.dry_weight)*100).toFixed(2)  }}%</span>
+          <span v-if="$store.getters.user.template_info.org_id == 10449 &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined">4小时超滤量上限（5%）:{{ (predialysis.dry_weight*0.05).toFixed(2)  }}kg</span>
+          <span v-if="$store.getters.user.template_info.org_id ==10599 &&predialysis!=undefined">心率:{{predialysis.pulse_frequency  }}次/分</span>&nbsp;
+          <span v-if="$store.getters.user.template_info.org_id ==10599 &&predialysis!=undefined">体温:{{predialysis.temperature  }}℃</span>&nbsp;
+          <span v-if="$store.getters.user.template_info.org_id ==10599 &&predialysis!=undefined">血压:{{predialysis.systolic_blood_pressure  }}/{{ predialysis.diastolic_blood_pressure  }}mmHg</span>
         </van-cell>
         <van-field
           v-model="dialysisPrescription.target_ultrafiltration"
@@ -188,9 +191,11 @@
         </van-field>
         <van-field v-model="dialysisPrescription.prescription_water" @focus="inputFocus" v-if="isShow('处方脱水量')" type="number" input-align="right">
             <template #label>
-                <span>处方脱水量(ml)</span>
+                <span v-if=" $store.getters.user.template_info.org_id!=10597">处方脱水量(ml)</span>
+                <span  v-if=" $store.getters.user.template_info.org_id==10597">处方脱水量(L)</span>
             </template>
          </van-field>
+         
         <van-collapse-item
           v-if="isShow('是否单超脱水')"
           title="是否单超脱水"
@@ -382,17 +387,17 @@
                     dialysisPrescription.anticoagulant != 1 &&
                     dialysisPrescription.anticoagulant != 12 && isShow_title('首剂')"
         >
-           <template #label v-if="$store.getters.user.template_info.org_id != 10101 && $store.getters.user.template_info.org_id != 10346  && $store.getters.user.template_info.template_id != 45 && $store.getters.user.template_info.template_id != 54  && $store.getters.user.template_info.org_id != 10340  && $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!=10447&& $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!=10471 && $store.getters.user.template_info.org_id!=10495 && $store.getters.user.template_info.org_id!=10375 && $store.getters.user.template_info.org_id!=10223 && $store.getters.user.template_info.org_id!=10551">
+           <template #label v-if="$store.getters.user.template_info.org_id != 10101 && $store.getters.user.template_info.org_id != 10346  && $store.getters.user.template_info.template_id != 45 && $store.getters.user.template_info.template_id != 54  && $store.getters.user.template_info.org_id != 10340  && $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!=10447&& $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!=10471 && $store.getters.user.template_info.org_id!=10495 && $store.getters.user.template_info.org_id!=10375 && $store.getters.user.template_info.org_id!=10223 && $store.getters.user.template_info.org_id!=10551 && $store.getters.user.template_info.org_id!=9882 && $store.getters.user.template_info.org_id!=10206&& $store.getters.user.template_info.org_id!=10580&& $store.getters.user.template_info.org_id!=10600&& $store.getters.user.template_info.org_id!=10587&& $store.getters.user.template_info.org_id!=10599&& $store.getters.user.template_info.org_id!=10597">
                       <span v-if="dialysisPrescription.anticoagulant == 0 || dialysisPrescription.anticoagulant == -2">首剂(mg)</span>
 
-                      <span v-if="dialysisPrescription.anticoagulant == 2 && $store.getters.user.template_info.template_id != 13 && $store.getters.user.template_info.template_id != 21 && $store.getters.user.template_info.template_id != 23 && $store.getters.user.template_info.template_id != 40 && $store.getters.user.template_info.template_id != 41  && $store.getters.user.template_info.template_id != 6 && $store.getters.user.template_info.template_id != 38 && $store.getters.user.template_info.template_id != 47 && $store.getters.user.template_info.template_id != 54 && $store.getters.user.template_info.org_id != 10234 && $store.getters.user.template_info.org_id !=10495 && $store.getters.user.template_info.org_id !=10375 ||  $store.getters.user.template_info.org_id ==9538 || $store.getters.user.template_info.org_id !=10340 || $store.getters.user.template_info.org_id !=10432  || $store.getters.user.template_info.org_id !=9829   ">首剂
+                      <span v-if="dialysisPrescription.anticoagulant == 2 && $store.getters.user.template_info.template_id != 13 && $store.getters.user.template_info.template_id != 21 && $store.getters.user.template_info.template_id != 23 && $store.getters.user.template_info.template_id != 40 && $store.getters.user.template_info.template_id != 41  && $store.getters.user.template_info.template_id != 6 && $store.getters.user.template_info.template_id != 38 && $store.getters.user.template_info.template_id != 47 && $store.getters.user.template_info.template_id != 54 && $store.getters.user.template_info.org_id != 10234 && $store.getters.user.template_info.org_id !=10495 && $store.getters.user.template_info.org_id !=10375 && $store.getters.user.template_info.org_id !=10580 ||  $store.getters.user.template_info.org_id ==9538 || $store.getters.user.template_info.org_id !=10340 || $store.getters.user.template_info.org_id !=10432  || $store.getters.user.template_info.org_id !=9829   ">首剂
                         <span v-if="$store.getters.user.template_info.org_id == 9538">(u)</span>
                         <span v-if="$store.getters.user.template_info.org_id != 9538">(iu)</span>
                       </span>
 
                       <span v-if="dialysisPrescription.anticoagulant == 2 && ($store.getters.user.template_info.template_id == 13 || $store.getters.user.template_info.template_id == 21 || $store.getters.user.template_info.template_id == 23 || $store.getters.user.template_info.template_id == 40 || $store.getters.user.template_info.template_id == 41 || ($store.getters.user.template_info.template_id == 6 && $store.getters.user.template_info.org_id!=9538) || $store.getters.user.template_info.template_id == 38 || $store.getters.user.template_info.template_id == 47 || $store.getters.user.template_info.template_id == 54 ||  $store.getters.user.template_info.org_id == 10234 || $store.getters.user.template_info.org_id == 10375 || $store.getters.user.template_info.org_id == 10340 || $store.getters.user.template_info.org_id == 10432 || $store.getters.user.template_info.org_id == 9829  || $store.getters.user.template_info.org_id ==10495 || $store.getters.user.template_info.org_id ==10551)">首剂(mg)</span>
 
-                      <span v-if="dialysisPrescription.anticoagulant == 3 || dialysisPrescription.anticoagulant == 8 || dialysisPrescription.anticoagulant == 9 || dialysisPrescription.anticoagulant ==10">
+                      <span v-if="dialysisPrescription.anticoagulant == 3 || dialysisPrescription.anticoagulant == 8 || dialysisPrescription.anticoagulant == 9 || dialysisPrescription.anticoagulant ==10 || dialysisPrescription.anticoagulant ==17">
                          <span v-if="$store.getters.user.template_info.org_id == 9671">首剂(mg)</span>
                         <!-- <span v-else>首剂(iu)</span> -->
                       </span>
@@ -410,7 +415,7 @@
                   </template>
 
                   <template #label v-else>
-                    <span v-if="dialysisPrescription.anticoagulant == 2">首剂(mg)</span>
+                    <span v-if="dialysisPrescription.anticoagulant == 2 || dialysisPrescription.anticoagulant == 17 ">首剂(mg)</span>
                     <span v-else>首剂(iu)</span>
                </template>
         </van-field>
@@ -442,7 +447,12 @@
               $store.getters.user.template_info.org_id != 10432 &&
               $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 != 10551 && 
+              $store.getters.user.template_info.org_id!=10600 &&
+              $store.getters.user.template_info.org_id!=10587 &&
+              $store.getters.user.template_info.org_id!=10599 &&
+              $store.getters.user.template_info.org_id!=10597
+              
             "
           >
             <span
@@ -471,7 +481,11 @@
                   $store.getters.user.template_info.org_id != 10495 &&
                   $store.getters.user.template_info.org_id != 10375 &&
                   $store.getters.user.template_info.org_id != 10223 &&
-                  $store.getters.user.template_info.org_id != 10551
+                  $store.getters.user.template_info.org_id != 10551 &&
+                  $store.getters.user.template_info.org_id!=10600 &&
+                  $store.getters.user.template_info.org_id!=10587 &&
+                  $store.getters.user.template_info.org_id!=10599 &&
+                  $store.getters.user.template_info.org_id!=10597
                   )
               "
             >
@@ -502,7 +516,11 @@
                   $store.getters.user.template_info.org_id == 10495 ||
                   $store.getters.user.template_info.org_id == 10375 ||
                   $store.getters.user.template_info.org_id == 10223 ||
-                  $store.getters.user.template_info.org_id == 10551
+                  $store.getters.user.template_info.org_id == 10551 ||
+                  $store.getters.user.template_info.org_id ==10600  ||
+                  $store.getters.user.template_info.org_id ==10587  ||
+                  $store.getters.user.template_info.org_id ==10599  ||
+                  $store.getters.user.template_info.org_id==10597
                   )
               "
               >维持(mg/h)</span
@@ -524,7 +542,10 @@
             <span v-if="dialysisPrescription.anticoagulant == 5"
               >维持(ml/h)</span
             >
-            <span v-if="dialysisPrescription.anticoagulant == 1"
+            <span v-if="dialysisPrescription.anticoagulant == 16"
+              >维持(iu/h)</span
+            >
+            <span v-if="dialysisPrescription.anticoagulant == 1 || dialysisPrescription.anticoagulant == 17"
               >维持(mg/h)</span
             >
             <span v-if="dialysisPrescription.anticoagulant == 6">
@@ -534,7 +555,8 @@
                   $store.getters.user.template_info.org_id == 10432 ||
                   $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 == 10551 
+
                 "
                 >维持(mg/h)</span
               >
@@ -590,7 +612,11 @@
               $store.getters.user.template_info.org_id != 10432 &&
               $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 != 10551 &&
+              $store.getters.user.template_info.org_id!=10600 &&
+              $store.getters.user.template_info.org_id!=10587 &&
+              $store.getters.user.template_info.org_id !=10599 &&
+              $store.getters.user.template_info.org_id!=10597
             "
           >
             <span
@@ -648,10 +674,11 @@
                 dialysisPrescription.anticoagulant == 3 ||
                 dialysisPrescription.anticoagulant == 8 ||
                 dialysisPrescription.anticoagulant == 9 ||
-                dialysisPrescription.anticoagulant == 10
+                dialysisPrescription.anticoagulant == 10 ||
+                dialysisPrescription.anticoagulant == 17
               "
             >
-              <span v-if="$store.getters.user.template_info.org_id == 9671">
+              <span v-if="$store.getters.user.template_info.org_id == 9671 || $store.getters.user.template_info.org_id == 10206">
                 总量(mg)</span
               >
               <span v-else> 总量(iu)</span>
@@ -674,12 +701,12 @@
               >
               <span v-else>总量(iu)</span>
             </span>
-            <span v-if="dialysisPrescription.anticoagulant == 11 || dialysisPrescription.anticoagulant == 13"
+            <span v-if="dialysisPrescription.anticoagulant == 11 || dialysisPrescription.anticoagulant == 13 || dialysisPrescription.anticoagulant == 16"
               >总量(iu)</span
             >
           </template>
           <template #label v-else>
-            <span v-if="dialysisPrescription.anticoagulant == 2">总量(mg)</span>
+            <span v-if="dialysisPrescription.anticoagulant == 2 || dialysisPrescription.anticoagulant == 17">总量(mg)</span>
             <span v-else>总量(iu)</span>
           </template>
         </van-field>
@@ -1045,6 +1072,16 @@
           input-align="right"
           :required="isShow_title('目标KT/V')"
         />
+
+        <van-collapse-item v-if="isShow('血管通路部位')" title="血管通路部位" name="blood_access_part_id">
+                  <template slot="title">
+                      <div><span v-if="isShow_title('血管通路部位')" class="warn_tip">*</span>血管通路部位</div>
+                  </template>
+                  <template #value>
+                      <div>{{dialysisPrescription.blood_access_part_id}}</div>
+                  </template>
+                  <checkBoxMenu v-if='checkBoxShow' v-on:menu-comfirm="getString" :propsForm="propForm"></checkBoxMenu>
+        </van-collapse-item>
         <van-collapse-item v-if="isShow('血管通路')" title="血管通路" name="10">
           <template slot="title">
                   <div><span v-if="isShow_title('血管通路')" class="warn_tip">*</span>血管通路</div>
@@ -1630,6 +1667,7 @@ export default {
         chaptalization:"",
         washing_time:"",
         warsh_count:"",
+        blood_access_part_id:"",
       },
       anticoagulant: {
         id: 0,
@@ -1967,10 +2005,17 @@ export default {
       console.log("org_idwpwpwpwppw",this.$store.getters.user.template_info.org_id )
       if(this.$store.getters.user.template_info.org_id == 10445){
         if(this.lastDialysisPrescription!=undefined){
-           console.log("wowowoowowowo")
            this.dialysisPrescription.remark = this.lastDialysisPrescription.remark
         }
       }
+
+      if(this.$store.getters.user.template_info.org_id == 10579 || this.$store.getters.user.template_info.org_id == 10587){
+        console.log("进来2噢噢噢哦",this.lastDialysisPrescription.blood_access_part_id)
+        if(this.lastDialysisPrescription!=undefined){
+
+           this.dialysisPrescription.blood_access_part_id = this.lastDialysisPrescription.blood_access_part_id
+        }
+      }
     }
 
     this.dialysisPrescription.calcium = this.getFloat(
@@ -3557,10 +3602,14 @@ export default {
         this.is_open = 0;
       }
       if(this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 3877){
-           if(this.dialysisPrescription.prescribing_number == 0){
-            Toast.fail('请填写开药数量!')
-            return
-           }
+          
+            if(this.dialysisPrescription.anticoagulant!=1){
+              if(this.dialysisPrescription.prescribing_number == 0){
+                  Toast.fail('请填写开药数量!')
+                  return
+              }
+            }
+          
 
            if(this.dialysisPrescription.anticoagulant == 0){
             Toast.fail('请填写抗凝剂!')
@@ -3568,13 +3617,9 @@ export default {
            }
         }
       if (this.$store.getters.user.template_info.template_id == 6) {
+        console.log(" this.dialysisPrescription.mode_id", this.dialysisPrescription.mode_id)
         if (this.dialysisPrescription.mode_id == 2) {
-          if (
-            this.dialysisPrescription.displace_liqui_part == 0 ||
-            this.dialysisPrescription.displace_liqui_part == -2 ||
-            this.dialysisPrescription.displace_liqui_value == 0 ||
-            this.dialysisPrescription.displace_liqui_value == ""
-          ) {
+          if ( this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 ||this.dialysisPrescription.displace_liqui_value == 0 || this.dialysisPrescription.displace_liqui_value == "") {
             Toast.fail("HDF模式下置换方式和置换液总量不能为空！");
             return;
           }
@@ -3582,7 +3627,13 @@ export default {
             this.dialysisPrescription.mode_id != 2 &&
             this.dialysisPrescription.mode_id != 5 &&
             this.dialysisPrescription.mode_id != 12 &&
-            this.dialysisPrescription.mode_id != 28
+            this.dialysisPrescription.mode_id != 28 &&
+            this.dialysisPrescription.mode_id != 34 &&
+            this.dialysisPrescription.mode_id != 35&&
+            this.dialysisPrescription.mode_id != 36&&
+            this.dialysisPrescription.mode_id != 37&&
+            this.dialysisPrescription.mode_id != 38 && 
+            this.dialysisPrescription.mode_id != 26
           ) {
             this.dialysisPrescription.displace_liqui_part = 0;
             this.dialysisPrescription.displace_liqui_value = 0;
@@ -3597,6 +3648,7 @@ export default {
 
           let ParamsQuery = arr;
           console.log("ParamsQueryOne", ParamsQuery);
+        
           if (this.$route.query.patient_id) {
             ParamsQuery["patient"] = this.$route.query.patient_id;
           } else {
@@ -3617,7 +3669,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -3781,12 +3833,12 @@ export default {
                   this.doctorAdvices = resp.data.advices;
                   this.$emit(
                     "longSolution",
-                    response.data.data.solution,
+                    resp.data.solution,
                     resp.data.advices
                   );
                   this.$emit(
                     "prescription",
-                    response.data.data.prescription,
+                    resp.data.prescription,
                     resp.data.advices
                   );
                 } else {
@@ -3809,6 +3861,7 @@ export default {
 
             let ParamsQuery = arr;
             console.log("ParamsQueryOne", ParamsQuery);
+           
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -3828,7 +3881,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -3951,6 +4004,7 @@ export default {
 
             let ParamsQuery = arr;
             console.log("ParamsQueryOne", ParamsQuery);
+         
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -3970,7 +4024,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -4103,6 +4157,7 @@ export default {
 
             let ParamsQuery = arr;
             console.log("ParamsQueryOne", ParamsQuery);
+           
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -4122,7 +4177,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -4321,7 +4376,8 @@ export default {
             var arr = this.dialysisPrescription;
 
             let ParamsQuery = arr;
-            console.log("ParamsQueryOne", ParamsQuery);
+            console.log("ParamsQueryOne5555", ParamsQuery);
+           
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -4341,7 +4397,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -4474,6 +4530,7 @@ export default {
 
             let ParamsQuery = arr;
             console.log("ParamsQueryOne", ParamsQuery);
+         
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -4493,7 +4550,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 & newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26 && newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -4703,6 +4760,7 @@ export default {
 
               let ParamsQuery = arr;
               console.log("ParamsQueryOne", ParamsQuery);
+             
               if (this.$route.query.patient_id) {
                 ParamsQuery["patient"] = this.$route.query.patient_id;
               } else {
@@ -4722,7 +4780,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28  && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -4854,6 +4912,7 @@ export default {
 
               let ParamsQuery = arr;
               console.log("ParamsQueryOne", ParamsQuery);
+            
               if (this.$route.query.patient_id) {
                 ParamsQuery["patient"] = this.$route.query.patient_id;
               } else {
@@ -4873,7 +4932,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26 && newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -5074,6 +5133,7 @@ export default {
 
               let ParamsQuery = arr;
               console.log("ParamsQueryOne", ParamsQuery);
+             
               if (this.$route.query.patient_id) {
                 ParamsQuery["patient"] = this.$route.query.patient_id;
               } else {
@@ -5093,7 +5153,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -5244,7 +5304,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28  && newParams.mode_id!= 26 && newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -5378,10 +5438,14 @@ export default {
         this.is_open = 0;
       }
       if(this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 3877){
-         if(this.dialysisPrescription.prescribing_number == 0){
-          Toast.fail('请填写开药数量!')
-          return
+        
+        if(this.dialysisPrescription.anticoagulant!=1){
+          if(this.dialysisPrescription.prescribing_number == 0){
+            Toast.fail('请填写开药数量!')
+             return
          }
+        }
+      
          if(this.dialysisPrescription.anticoagulant == 0){
           Toast.fail('请填写抗凝剂!')
           return
@@ -5402,7 +5466,13 @@ export default {
             this.dialysisPrescription.mode_id != 2 &&
             this.dialysisPrescription.mode_id != 5 &&
             this.dialysisPrescription.mode_id != 12 &&
-            this.dialysisPrescription.mode_id !=28
+            this.dialysisPrescription.mode_id !=28 &&
+            this.dialysisPrescription.mode_id !=34 &&
+            this.dialysisPrescription.mode_id !=35&&
+            this.dialysisPrescription.mode_id !=36&&
+            this.dialysisPrescription.mode_id !=37&&
+            this.dialysisPrescription.mode_id !=38&&
+            this.dialysisPrescription.mode_id !=26
           ) {
             this.dialysisPrescription.displace_liqui_part = 0;
             this.dialysisPrescription.displace_liqui_value = 0;
@@ -5417,6 +5487,7 @@ export default {
 
           let ParamsQuery = arr;
           console.log("ParamsQueryOne", ParamsQuery);
+         
           if (this.$route.query.patient_id) {
             ParamsQuery["patient"] = this.$route.query.patient_id;
           } else {
@@ -5436,7 +5507,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 26 && newParams.mode_id!= 34 && newParams.mode_id!= 35 && newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -5624,6 +5695,7 @@ export default {
 
             let ParamsQuery = arr;
             console.log("ParamsQueryOne", ParamsQuery);
+         
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -5643,7 +5715,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 &&newParams.mode_id!= 26){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -5763,12 +5835,13 @@ export default {
           }
 
           } else {
-            console.log('777777777',this.is_open);
+         
             Toast.loading({ forbidClick: true, duration: 0 });
             var arr = this.dialysisPrescription;
 
             let ParamsQuery = arr;
             console.log("ParamsQueryOne", ParamsQuery);
+          
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -5788,7 +5861,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26 && newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -5921,6 +5994,7 @@ export default {
 
             let ParamsQuery = arr;
             console.log("ParamsQueryOne", ParamsQuery);
+          
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -5940,7 +6014,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26 && newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -6130,7 +6204,8 @@ export default {
             var arr = this.dialysisPrescription;
 
             let ParamsQuery = arr;
-            console.log("ParamsQueryOne", ParamsQuery);
+          
+           
             if (this.$route.query.patient_id) {
               ParamsQuery["patient"] = this.$route.query.patient_id;
             } else {
@@ -6150,7 +6225,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -6302,7 +6377,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -6510,7 +6585,7 @@ export default {
               delete newParams.oxygen_time;
               delete newParams.oxygen_flow;
             }
-            if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+            if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
               delete newParams.replacement_total;
               delete newParams.displace_liqui_part;
               delete newParams.displace_liqui_value;
@@ -6653,7 +6728,7 @@ export default {
               delete newParams.oxygen_time;
               delete newParams.oxygen_flow;
             }
-            if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+            if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28&& newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
               delete newParams.replacement_total;
               delete newParams.displace_liqui_part;
               delete newParams.displace_liqui_value;
@@ -6805,7 +6880,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28&& newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -7022,7 +7097,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12  && newParams.mode_id!= 28 && newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 36){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -7173,7 +7248,7 @@ export default {
             delete newParams.oxygen_time;
             delete newParams.oxygen_flow;
           }
-          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28){
+          if (newParams.mode_id!=2 && newParams.mode_id!=5 && newParams.mode_id!= 12 && newParams.mode_id!= 28&& newParams.mode_id!= 26&& newParams.mode_id!= 34&& newParams.mode_id!= 35&& newParams.mode_id!= 36&& newParams.mode_id!= 37){
             delete newParams.replacement_total;
             delete newParams.displace_liqui_part;
             delete newParams.displace_liqui_value;
@@ -9184,7 +9259,7 @@ export default {
             arr1[j].is_show == 1 &&
             arr1[j].is_write == 1 &&
             arr1[j].filed_name == arr2[i][0]
-            &&(this.dialysisPrescription.mode_id == 2||this.dialysisPrescription.mode_id == 5||this.dialysisPrescription.mode_id == 12 ||this.dialysisPrescription.mode_id == 28)
+            &&(this.dialysisPrescription.mode_id == 2||this.dialysisPrescription.mode_id == 5||this.dialysisPrescription.mode_id == 12 ||this.dialysisPrescription.mode_id == 28 ||this.dialysisPrescription.mode_id == 26)
             &&arr1[j].filed_name == 'displace_liqui_part'
           ) {
             newArr.push(arr1[j]);
@@ -9194,7 +9269,7 @@ export default {
             arr1[j].is_show == 1 &&
             arr1[j].is_write == 1 &&
             arr1[j].filed_name == arr2[i][0]
-            &&(this.dialysisPrescription.mode_id == 2||this.dialysisPrescription.mode_id == 5||this.dialysisPrescription.mode_id == 12 ||this.dialysisPrescription.mode_id == 28)
+            &&(this.dialysisPrescription.mode_id == 2||this.dialysisPrescription.mode_id == 5||this.dialysisPrescription.mode_id == 12 ||this.dialysisPrescription.mode_id == 28 ||this.dialysisPrescription.mode_id == 26 )
             &&arr1[j].filed_name == 'replacement_total'
           ) {
             newArr.push(arr1[j]);
@@ -9204,7 +9279,7 @@ export default {
             arr1[j].is_show == 1 &&
             arr1[j].is_write == 1 &&
             arr1[j].filed_name == arr2[i][0]
-            &&(this.dialysisPrescription.mode_id == 2||this.dialysisPrescription.mode_id == 5||this.dialysisPrescription.mode_id == 12 ||this.dialysisPrescription.mode_id == 28)
+            &&(this.dialysisPrescription.mode_id == 2||this.dialysisPrescription.mode_id == 5||this.dialysisPrescription.mode_id == 12 ||this.dialysisPrescription.mode_id == 28 ||this.dialysisPrescription.mode_id == 26)
             &&arr1[j].filed_name == 'displace_liqui_value'
           ) {
             newArr.push(arr1[j]);delete newParams.displace_speed;
@@ -9214,7 +9289,7 @@ export default {
             arr1[j].is_show == 1 &&
             arr1[j].is_write == 1 &&
             arr1[j].filed_name == arr2[i][0]
-            &&(this.dialysisPrescription.mode_id == 2||this.dialysisPrescription.mode_id == 5||this.dialysisPrescription.mode_id == 12 ||this.dialysisPrescription.mode_id == 28)
+            &&(this.dialysisPrescription.mode_id == 2||this.dialysisPrescription.mode_id == 5||this.dialysisPrescription.mode_id == 12 ||this.dialysisPrescription.mode_id == 28 ||this.dialysisPrescription.mode_id == 26)
             &&arr1[j].filed_name == 'displace_speed'
           ) {
             newArr.push(arr1[j]);
@@ -10192,6 +10267,38 @@ export default {
           this.propForm.click_ref = "vascular_access_desc";
           break;
 
+       case 'blood_access_part_id':
+
+        this.propForm.result = []
+        this.isHasOther = 2
+        this.propForm.isShowOther = 1
+
+        this.propForm.type = 20
+        this.isShowDialog = false
+        this.propForm.title = '血管通路部位'
+        this.visibility = true
+        this.propForm.list = []
+        this.propForm.list = getDataConfig(
+          'hemodialysis',
+          'vascular_access'
+        )
+        this.propForm.optionList = []
+        this.propForm.isMultiple = 2
+        if (
+          this.dialysisPrescription.blood_access_part_id != undefined ||
+                  this.dialysisPrescription.blood_access_part_id != null
+        ) {
+          if (this.dialysisPrescription.blood_access_part_id.length > 0) {
+            this.propForm.result = this.dialysisPrescription.blood_access_part_id.split(',')
+          } else {
+            this.propForm.result = []
+          }
+        } else {
+          this.propForm.result = []
+        }
+        this.propForm.click_ref = 'blood_access_part_id'
+        break
+
         case "dialyzer_perfusion_apparatus":
           this.propForm.type = 11;
           this.isShowDialog = false;
@@ -10590,6 +10697,9 @@ export default {
         case 19:
         this.dialysisPrescription.dialysis_strainer = val.result.join(',')
         break
+        case 20:
+        this.dialysisPrescription.blood_access_part_id = val.result.join(',')
+        break
       }
     },
     getPermission() {

src/pages/main/newActionBar/doubleCheck.vue

@@ -89,7 +89,7 @@
               <van-cell title='第一核对人员'>
                   <template #label>
                       <van-radio-group class="doctorList" v-model="doubleReview.creater">
-                          <van-radio :name="item.id" v-for='(item,index) in admin_map' :key="index"  v-if='item.status === 1'>{{ item.name }}</van-radio>
+                          <van-radio :name="item.id" v-for='(item,index) in admin_map' :key="index"  v-if='item.status === 1&& item.user_type ===3'>{{ item.name }}</van-radio>
                       </van-radio-group>
                   </template>
               </van-cell>
@@ -97,7 +97,7 @@
               <van-cell title='第二核对人员'>
                   <template #label>
                       <van-radio-group class="doctorList" v-model="doubleReview.modifier">
-                          <van-radio :name="item.id"  v-for='(item,index) in admin_map' :key="index" v-if='item.status === 1'>{{ item.name }}</van-radio>
+                          <van-radio :name="item.id"  v-for='(item,index) in admin_map' :key="index" v-if='item.status === 1&& item.user_type ===3 '>{{ item.name }}</van-radio>
                       </van-radio-group>
                   </template>
               </van-cell>

src/pages/main/newActionBar/monitoring.vue

@@ -38,22 +38,22 @@
                   <th v-if="isShow('血流量')" width="40px" style="width:5%"> 血流量 <br />(ml/min) </th>
                   <th width="60px" style="width:6%"> 静脉压/动脉压 <br />({{monitorRecords[0]&&monitorRecords[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}}) </th>
                   <th v-if="isShow('跨膜压')" width="40px" style="width:6%"> 跨膜压 <br />({{monitorRecords[0]&&monitorRecords[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}}) </th>
-                  <th v-if="isShow('超滤量') && (template_id ==5 || template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || org_id == 9555 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 9 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 65 || template_id == 56 || template_id == 60 || org_id == 10340 || org_id == 10387 || org_id == 10432 || org_id == 10445 || org_id == 10375 || org_id == 10480 || org_id == 10551)" width="50px" style="width:6%"> 超滤量 <br />(ml) </th>
-                  <th v-if="isShow('超滤量') && template_id != 5 && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && org_id !=9555 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id !=9 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id!=40 && template_id!=41 && template_id!=43 && template_id!=44 && template_id!=47 && template_id!=46  && template_id!=48 && template_id!=53 && template_id!=54 && template_id!=65 && template_id!=56 && template_id!=60 && org_id != 10340 && org_id != 10387 && org_id != 10432  && org_id != 10445 && org_id!=10375 && org_id!=10480 && org_id!=10551" width="50px" style="width:6%"> 超滤量 <br />(L) </th>
+                  <th v-if="isShow('超滤量') && (template_id ==5 || template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || org_id == 9555 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 9 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 65 || template_id == 56 || template_id == 60 || org_id == 10340 || org_id == 10387 || org_id == 10432 || org_id == 10445 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id == 10485)" width="50px" style="width:6%"> 超滤量 <br />(ml) </th>
+                  <th v-if="isShow('超滤量') && template_id != 5 && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && org_id !=9555 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id !=9 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id!=40 && template_id!=41 && template_id!=43 && template_id!=44 && template_id!=47 && template_id!=46  && template_id!=48 && template_id!=53 && template_id!=54 && template_id!=65 && template_id!=56 && template_id!=60 && org_id != 10340 && org_id != 10387 && org_id != 10432  && org_id != 10445 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10485" width="50px" style="width:6%"> 超滤量 <br />(L) </th>
                   <th v-if="isShow('钠浓度')" width="40px" style="width:6%"> 钠浓度 <br />(mmol/L) </th>
                   <th v-if="isShow('透析液温度')" width="60px" style="width:6%"> 透析液温度 <br />(℃) </th>
                   <th v-if="isShow('置换率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29  || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || org_id == 10340 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="50px" style="width:6%"> 置换率 <br />(ml/min) </th>
                   <th v-if="isShow('置换率') && (template_id !=6 && template_id !=10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29  && template_id != 46 && template_id != 48 && template_id != 53  && template_id != 54 && org_id!=10340 && org_id!=10445 && org_id!=10410) || org_id ==10558" width="50px"  style="width:6%"> 置换率 <br />(L/h) </th>
                   <th v-if="isShow('置换量') && (template_id ==43 )" width="40px" style="width:6%"> 置换量 <br />(ml/h) </th>
-                  <th v-if="isShow('置换量') && ((template_id ==6 && org_id != 9919 && org_id!=10191 && template_id!=43) || org_id ==9779 ||template_id ==11 ||template_id ==20 ||template_id ==26 ||template_id ==29 ||template_id == 48 ||template_id == 46 ||template_id == 53 ||template_id == 54 ||template_id == 56 ||org_id == 10340 ||org_id == 10432 ||org_id == 10445) && org_id!=10558" width="50px" style="width:6%"> 置换量 <br />(ml) </th>
-                  <th v-if="isShow('置换量') && ((template_id !=6 || org_id == 9919 || org_id == 10191) && org_id !=9779 && template_id !=11 && template_id !=20 && template_id !=26 && template_id !=29 && template_id!=43 && template_id!=48 && template_id!=46 && template_id!=53 && template_id!=54 && template_id!=56 && org_id!=10340 && org_id!=10432  && org_id!=10445) || org_id ==10558" width="50px" style="width:6%"> 置换量 <br />(L) </th>
+                  <th v-if="isShow('置换量') && ((template_id ==6 && org_id != 9919 && org_id!=10191 && template_id!=43) || org_id ==9779 ||template_id ==11 ||template_id ==20 ||template_id ==26 ||template_id ==29 ||template_id == 48 ||template_id == 46 ||template_id == 53 ||template_id == 54 ||template_id == 56 ||org_id == 10340 ||org_id == 10432 ||org_id == 10445) && org_id!=10558 && org_id!=10346" width="50px" style="width:6%"> 置换量 <br />(ml) </th>
+                  <th v-if="isShow('置换量') && ((template_id !=6 || org_id == 9919 || org_id == 10191) && org_id !=9779 && template_id !=11 && template_id !=20 && template_id !=26 && template_id !=29 && template_id!=43 && template_id!=48 && template_id!=46 && template_id!=53 && template_id!=54 && template_id!=56 && org_id!=10340 && org_id!=10432  && org_id!=10445) || org_id ==10558 || org_id ==10346" width="50px" style="width:6%"> 置换量 <br />(L) </th>
                   <th v-if="isShow('SpO₂')  && template_id !=6 && template_id !=10 && template_id !=11" width="40px" > SpO₂ <br />(%) </th>
                   <th v-if="isShow('SpO₂')  && org_id == 10447" width="40px" > SpO₂ <br />(%) </th>
                   <th v-if="isShow('电导度')" width="40px"> 电导度 <br />(mS/cm) </th>
-                  <th v-if="isShow('置换液流量')" width="50px"> 置换液流量 <br /><span v-if="template_id !=27">(ml/h)</span><span v-if="template_id ==27 || template_id ==29 ">(ml/min)</span> </th>
+                  <th v-if="isShow('置换液流量')" width="50px"> 置换液流量 <br /><span v-if="template_id !=27 && template_id !=29 && template_id !=60">(ml/h)</span><span v-if="template_id ==27 || template_id ==29 || template_id == 60">(ml/min)</span> </th>
                   <th v-if="isShow('透析液流量')" width="50px"> 透析液流量 <br />(ml/h) </th>
-                  <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 65 || org_id == 10432 || org_id == 10445 || org_id == 10375 || org_id == 10480 || org_id == 10551)" width="50px" style="6%"> 超滤率 <br />(ml/h) </th>
-                  <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38 && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=47 && template_id !=48 && template_id !=53 && template_id !=54 && template_id !=56 && template_id !=65 && org_id!=10432 && org_id!=10445 && org_id!=10375  && org_id!=10480 && org_id!=10551" width="50px" style="6%"> 超滤率 <br />(L/h) </th>
+                  <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 65 || org_id == 10432 || org_id == 10445 || org_id == 10375 || org_id == 10480 || org_id == 10551  || org_id == 10537)" width="50px" style="6%"> 超滤率 <br />(ml/h) </th>
+                  <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38 && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=47 && template_id !=48 && template_id !=53 && template_id !=54 && template_id !=56 && template_id !=65 && org_id!=10432 && org_id!=10445 && org_id!=10375  && org_id!=10480 && org_id!=10551 && org_id!=10537" width="50px" style="6%"> 超滤率 <br />(L/h) </th>
                   <th v-if="isShow('肝素用量余量')" width="60px"> 肝素用量余量 <br />(ml) </th>
                   <th v-if="isShow('肝素量')" width="60px"> 肝素量 <br />(mg) </th>
                   <th v-if="isShow('抗凝剂')" width="60px">抗凝剂</th>
@@ -67,7 +67,7 @@
                   <th v-if="isShow('血浓量')" width="60px">血浓量</th>
                   <!-- <th v-if="isShow('血浓量')" width="60px">血浓量</th> -->
                   <th v-if="isShow('脱水')" width="60px">脱水</th>
-                  <th v-if="isShow('KT/V') && (org_id == 9987|| org_id == 10215 || org_id == 9800)" width="60px">KT/V</th>
+                  <th v-if="isShow('KT/V') && (org_id == 9987|| org_id == 10215 || org_id == 9800 || org_id ==10517)" width="60px">KT/V</th>
                 
                   <th v-if="isShow('病情变化')" width="92px" >病情变化</th>
                   <th v-if="isShow('处理')" width="92px" >处理</th>
@@ -127,7 +127,7 @@
                   <!-- <td v-if="isShow('血浓量')" width="60px">{{item.blood_monitor}}</td> -->
                   <td v-if="isShow('脱水')" width="60px">{{item.dehydration}}</td>
 
-                  <td v-if="isShow('KT/V') && (org_id == 9987 || org_id ==10215 || org_id == 9800)">{{item.ktv?item.ktv:''}}</td>
+                  <td v-if="isShow('KT/V') && (org_id == 9987 || org_id ==10215 || org_id == 9800 || org_id ==10517)">{{item.ktv?item.ktv:''}}</td>
                   <td v-if="isShow('病情变化')">{{item.symptom}}</td>
                   <td v-if="isShow('处理')">{{item.dispose}}</td>
                   <td v-if="isShow('结果')">{{item.result}}</td>
@@ -159,6 +159,8 @@
                           <van-field v-model="form.temperature" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('体温')" :required="isShow_title('体温')" label="体温(℃)" type="number" input-align="right" />
                           <van-field  v-model="form.breathing_rated" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('呼吸频率')&& org_id!=10340 && org_id!=9671" :required="isShow_title('呼吸频率')" label="呼吸频率(次/分)" input-align="right" />
                           <van-field  v-model="form.breathing_rated" @focus="inputFocus" @keydown='changeFocus' type="number" v-if="isShow('呼吸频率')&& (org_id ==10340 || org_id ==9671)" :required="isShow_title('呼吸频率')" label="呼吸频率(次/分)" input-align="right" />
+                         
+
                           <van-field v-model="form.blood_flow_volume" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('血流量')" :required="isShow_title('血流量')" label="血流量(ml/min)" type="number" input-align="right" />
                           <van-field v-model="form.arterial_pressure" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('动脉压')  && org_id!=10340 && org_id!=9671" :required="isShow_title('动脉压')" input-align="right">
                               <template #label>
@@ -186,6 +188,8 @@
                                   <van-button @click="venousPressureChangeOne" size="small" class="changeBtn" type="primary" style="margin-left:40px">切换</van-button>
                               </template>
                           </van-field>
+                         
+                          
                           <van-field v-model="form.transmembrane_pressure" @focus="inputFocus" @keydown='changeFocus' :required="isShow_title('跨膜压')" v-if="isShow('跨膜压')" type="number" input-align="right">
                               <template #label>
                                   <span>跨膜压({{form.transmembrane_pressure_type == 2 ? 'kpa': 'mmHg'}})</span>
@@ -194,6 +198,8 @@
                                   <van-button @click="venousPressureChangeTwo" size="small" class="changeBtn" type="primary" style="margin-left:40px">切换</van-button>
                               </template>
                           </van-field>
+                          
+                         
                           <van-field v-model="form.ultrafiltration_volume" @focus="inputFocus" @keydown='changeFocus' :required="isShow_title('超滤量')" v-if="isShow('超滤量')" type="number" input-align="right">
                               <template #label>
                                   <!-- <span v-if="template_id == 5 || template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || org_id == 9555 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 9 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 40 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || org_id == 10340  || org_id == 10387 || org_id == 10432 || org_id == 10445" >超滤量(ml)</span>
@@ -206,7 +212,7 @@
                               <template #label>
                                   <!-- <span v-if="template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || org_id == 10340 || org_id == 10432 || org_id == 10445">超滤率(ml/h)</span>
                                   <span v-if="(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || org_id == 10340 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id == 10485) && org_id!=10471">超滤率(ml/h)</span> -->
-                                  <span v-if="(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || org_id == 10340 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551) && org_id!=10471">超滤率(ml/h)</span>
+                                  <span v-if="(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || org_id == 10340 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10537) && org_id!=10471">超滤率(ml/h)</span>
                                   <span v-else>超滤率(L/h)</span>
                               </template>
                           </van-field>
@@ -239,8 +245,8 @@
                           <van-field v-model="form.blood_sugar" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('血糖')" :required="isShow_title('血糖')" label="血糖(mmol/L)" type="number" input-align="right"/>
                           <van-field v-model="form.displacement_flow_quantity" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('置换液流量')" :required="isShow_title('置换液流量')" type="number" input-align="right">
                               <template #label>
-                                  <span v-if="template_id != 27">置换液流量(ml/h)</span>
-                                  <span v-if="template_id == 27 || template_id == 29">置换液流量(ml/min)</span>
+                                  <span v-if="template_id != 27 && template_id!=29 && template_id!=60">置换液流量(ml/h)</span>
+                                  <span v-if="template_id == 27 || template_id == 29 || template_id ==60">置换液流量(ml/min)</span>
                               </template>
                           </van-field>
                           <van-field v-model="form.dialysate_flow" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('透析液流量')" :required="isShow_title('透析液流量')" label="透析液流量(ml/h)" type="number" input-align="right"/>
@@ -386,10 +392,10 @@
                             <th v-if="isShow('SpO₂')  && template_id !=6 && template_id !=10 && template_id !=11" width="40px" > SpO₂ <br />(%) </th>
                             <th v-if="isShow('SpO₂')  && org_id == 10447" width="40px" > SpO₂ <br />(%) </th>
                             <th v-if="isShow('电导度')" width="40px"> 电导度 <br />(mS/cm) </th>
-                            <th v-if="isShow('置换液流量')" width="50px"> 置换液流量 <br /><span v-if="template_id !=27">(ml/h)</span><span v-if="template_id ==27 || template_id ==29 ">(ml/min)</span> </th>
+                            <th v-if="isShow('置换液流量')" width="50px"> 置换液流量 <br /><span v-if="template_id !=27 && template_id !=29 && template_id !=60">(ml/h)</span><span v-if="template_id ==27 || template_id ==29 || template_id==60">(ml/min)</span> </th>
                             <th v-if="isShow('透析液流量')" width="50px"> 透析液流量 <br />(ml/h) </th>
-                            <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10480)" width="50px"> 超滤率 <br />(ml/h) </th>
-                            <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38 && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=47 && template_id !=48 && template_id !=53 && template_id !=54 && template_id !=56 && org_id!=10432 && org_id!=10445 && org_id!=10480" width="50px"> 超滤率 <br />(L/h) </th>
+                            <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 47 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10480 || org_id ==10537)" width="50px"> 超滤率 <br />(ml/h) </th>
+                            <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38 && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=47 && template_id !=48 && template_id !=53 && template_id !=54 && template_id !=56 && org_id!=10432 && org_id!=10445 && org_id!=10480 && org_id!=10537" width="50px"> 超滤率 <br />(L/h) </th>
                             <th v-if="isShow('肝素用量余量')" width="60px"> 肝素用量余量 <br />(ml) </th>
                             <th v-if="isShow('肝素量')" width="60px"> 肝素量 <br />(mg) </th>
                             <th v-if="isShow('抗凝剂')" width="60px">抗凝剂</th>
@@ -403,7 +409,7 @@
                             <th v-if="isShow('血浓量')" width="60px">血浓量</th>
                             <!-- <th v-if="isShow('血浓量')" width="60px">血浓量</th> -->
                             <th v-if="isShow('脱水')" width="60px">脱水</th>
-                            <th v-if="isShow('KT/V') && (org_id == 9987|| org_id == 10215 || org_id == 9800)" width="60px">KT/V</th>
+                            <th v-if="isShow('KT/V') && (org_id == 9987|| org_id == 10215 || org_id == 9800 || org_id ==10517)" width="60px">KT/V</th>
                             <th v-if="isShow('病情变化')" width="92px">病情变化</th>
                             <th v-if="isShow('处理')" width="92px">处理</th>
                             <th v-if="isShow('结果')" width="92px">结果</th>
@@ -448,7 +454,7 @@
                                 <span v-if="item.monitor_anticoagulant == 13">那屈肝素钙</span>
                               <span v-if="item.monitor_anticoagulant_value!=''">({{item.monitor_anticoagulant_value}})</span>
                               </td>
-                              <td v-if="isShow('KT/V') && (org_id == 9987 || org_id ==10215 || org_id == 9800 || org_id == 10278 || org_id == 10138 )">{{item.ktv?item.ktv:''}}</td>
+                              <td v-if="isShow('KT/V') && (org_id == 9987 || org_id ==10215 || org_id == 9800 || org_id == 10278 || org_id == 10138 || org_id ==10517)">{{item.ktv?item.ktv:''}}</td>
                               <td v-if="isShow('病情变化')">{{item.symptom}}</td>
                               <td v-if="isShow('处理')">{{item.dispose}}</td>
                               <td v-if="isShow('结果')">{{item.result}}</td>

src/pages/main/template/DialysisPrintOrderOne.vue

@@ -34,8 +34,8 @@
               </td>
               <td width="110">住院号/透析卡号:</td>
               <td width="130">
-                <div class="under-line">&nbsp;{{patientInfo.admission_number?patientInfo.admission_number:'无'}}
-                  /{{patientInfo.dialysis_no}}
+                <div class="under-line">&nbsp;{{receiverTreatmentAccess.admission_number?receiverTreatmentAccess.admission_number:'无'}}
+                  <span v-if="receiverTreatmentAccess.admission_number==''|| receiverTreatmentAccess.admission_number ==0"> /{{patientInfo.dialysis_no}}</span>
                 </div>
               </td>
             </tr>

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -360,7 +360,8 @@
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     置换量：
                     <div class="under_line" style="width: 70px;text-align: center">
-                      {{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}
+                      <span v-if="org_id!=10206">{{prescription.displace_liqui_value?prescription.displace_liqui_value:'/'}}</span> 
+                      <span v-if="org_id==10206">{{prescription.replacement_total?prescription.replacement_total:'/'}}</span>
                     </div>
                     L
                   </div>
@@ -497,14 +498,14 @@
                     <div class="under_line" style="width: 50px;text-align: center;">
                       {{prescription.anticoagulant_shouji?prescription.anticoagulant_shouji:'/'}}
                     </div>
-                    <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471">
+                    <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10206">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                     </span>
 
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id ==10206">
                       <span v-if="prescription.anticoagulant == 4">iu</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -516,6 +517,9 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                     <span v-if="prescription.anticoagulant == 16">iu</span>
+                     <span v-if="prescription.anticoagulant == 17">mg</span>
+
 
                     </span>
 
@@ -529,7 +533,7 @@
                     <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
                       {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
                     </div>
-                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471&& org_id!=10206">
 
                        <span v-if="prescription.anticoagulant == 5">ml/h</span>
                         <span v-if="prescription.anticoagulant == 4">mg/h</span>
@@ -537,7 +541,7 @@
                         <span v-if="prescription.anticoagulant == 2">iu/h</span>
                         <span v-if="prescription.anticoagulant == 1">mg/h</span>
                      </span>
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10206">
                        <span v-if="prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="prescription.anticoagulant == 3">iu/h</span>
                         <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -549,6 +553,8 @@
                         <span v-if="prescription.anticoagulant == 10">iu/h</span>
                         <span v-if="prescription.anticoagulant == 11">iu/h</span>
                         <span v-if="prescription.anticoagulant == 13">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 16">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 17">mg/h</span>
                     </span>
 
                   </div>
@@ -571,13 +577,13 @@
                     <div class="under_line" style="width: 50px;text-align: center;">
                       {{prescription.anticoagulant_zongliang?prescription.anticoagulant_zongliang:'/'}}
                     </div>
-                    <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                    <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10206">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                      </span>
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10206">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
                        <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -589,6 +595,8 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
+                      <span v-if="prescription.anticoagulant == 16">iu</span>
+                      <span v-if="prescription.anticoagulant == 17">mg</span>
 
                     </span>
 
@@ -1147,7 +1155,7 @@
                     <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
                   </div>
                 </div>
-                <div class="inline_block" style="flex:1;">
+                <div class="inline_block" style="flex:1;" v-if="org_id!=10206">
                   治疗护士：
                   <div class="under_line" style="width: 80px;text-align: center">
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
@@ -1155,7 +1163,8 @@
                   </div>
                 </div>
                 <div class="inline_block" style="flex:1;">
-                  核对人员：
+                  <span v-if="org_id!=10206"> 核对人员：</span>
+                  <span v-if="org_id==10206"> 核对护士：</span>
                   <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder == null">
                     <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>

src/pages/main/template/DialysisPrintOrderSixty.vue

@@ -1024,7 +1024,8 @@
                         }})
                       </td>
                       <td width="60">透析液温度(°C)</td>
-                      <td width="60">电导度<br />(mS/cm)</td>
+                      <td width="60" v-if="org_id!=10537">电导度<br />(mS/cm)</td>
+                      <td width="60" v-if="org_id ==10537">钠浓度<br />(mS/cm)</td>
                       <td width="50">超滤量<br />(ml)</td>
                       <td width="200">病情变化及处理</td>
                     </tr>
@@ -1081,9 +1082,12 @@
                             : ""
                         }}
                       </td>
-                      <td>
+                      <td v-if="org_id!=10537">
                         {{ monitor.conductivity ? monitor.conductivity : "" }}
                       </td>
+                      <td v-if="org_id ==10537">
+                        {{ monitor.sodium_concentration?monitor.sodium_concentration:"" }}
+                      </td>
                       <td>
                         {{
                           monitor.ultrafiltration_volume

src/pages/main/today/dialysisMonitoring.vue

@@ -26,10 +26,10 @@
           <th v-if="isShow('置换率')&& (template_id == 6 ||template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 48 || template_id == 53  || template_id == 54 | template_id == 56 || org_id == 10340 || org_id == 10410 || org_id == 10375) && org_id==10558" width="60px" > 置换率 <br />(ml/min) </th>
           <th v-if="isShow('置换率')&& (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10340  && org_id!=10410 && org_id!=10375) || org_id ==10558" width="60px" > 置换率 <br />(L/h) </th>
            <th v-if="isShow('置换量')&& (template_id == 43 )" width="50px" > 置换量 <br />(ml/h) </th>
-          <th v-if="isShow('置换量')&& ((template_id == 6 && org_id != 9919 && template_id!=43 && org_id!=10478) || (template_id == 10 && org_id!=10191) || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29  || template_id == 46  || template_id == 47 || template_id == 48 || template_id == 53 || template_id == 54 | template_id == 56 || org_id == 10340 || org_id == 10432) && org_id!=10558" width="50px" > 置换量 <br />(ml) </th>
-          <th v-if="isShow('置换量')&& ((template_id != 6 || org_id == 9919 || org_id ==10478) && (template_id != 10 || org_id == 10191) && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id!=43 && template_id!=46 && template_id!=47  && template_id!=48  && template_id!=53 && template_id!=54 && template_id!=56 && org_id!=10340  && org_id!=10432) || org_id == 10558" width="50px" > 置换量 <br />(L) </th>
+          <th v-if="isShow('置换量')&& ((template_id == 6 && org_id != 9919 && template_id!=43 && org_id!=10478) || (template_id == 10 && org_id!=10191) || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29  || template_id == 46  || template_id == 47 || template_id == 48 || template_id == 53 || template_id == 54 | template_id == 56 || org_id == 10340 || org_id == 10432) && org_id!=10558 && org_id!=10346" width="50px" > 置换量 <br />(ml) </th>
+          <th v-if="isShow('置换量')&& ((template_id != 6 || org_id == 9919 || org_id ==10478) && (template_id != 10 || org_id == 10191) && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id!=43 && template_id!=46 && template_id!=47  && template_id!=48  && template_id!=53 && template_id!=54 && template_id!=56 && org_id!=10340  && org_id!=10432) || org_id == 10558 || org_id ==10346" width="50px" > 置换量 <br />(L) </th>
           <th v-if="isShow('电导度')" width="60px"> 电导度 <br />(mS/cm) </th>
-          <th v-if="isShow('置换液流量')" width="70px"> 置换液流量 <br /><span v-if="template_id !=27">(ml/h)</span><span v-if="template_id == 27 || template_id == 29">(ml/min)</span>  </th>
+          <th v-if="isShow('置换液流量')" width="70px"> 置换液流量 <br /><span v-if="template_id !=27 && template_id!=29 && template_id!=60">(ml/h)</span><span v-if="template_id == 27 || template_id == 29 || template_id ==60">(ml/min)</span>  </th>
           <th v-if="isShow('透析液流量')" width="70px"> 透析液流量 <br />(ml/h)  </th>
 
           <th v-if="isShow('肝素用量余量')" width="70px"> 肝素用量余量 <br />(ml) </th>

src/pages/main/today/dialysisPrescription.vue

@@ -26,7 +26,8 @@
 
         <li v-if="isShow('处方脱水量')">
           <label>处方脱水量 :</label>
-          <span class="content">{{prescription_water != '0'?prescription_water:''}}ml</span>
+          <span class="content" v-if="this.$store.getters.user.template_info.org_id !=10597">{{prescription_water != '0'?prescription_water:''}}ml</span>
+          <span class="content" v-if="this.$store.getters.user.template_info.org_id ==10597">{{prescription_water != '0'?prescription_water:''}}L</span>
         </li>
 
         <li v-if="isShow('钙')">
@@ -115,6 +116,8 @@
              </span>
             <span class="unit" v-if="this.prescription.anticoagulant == 8">{{anticoagulant_shouji != '0'?"iu":""}}</span>
             <span class="unit" v-if="this.prescription.anticoagulant == 9">{{anticoagulant_shouji != '0'?"iu":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 16">{{anticoagulant_shouji != '0'?"iu":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 17">{{anticoagulant_shouji != '0'?"mg":""}}</span>
           </span>
           <span v-else>
             <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_shouji != '0'?"mg":""}}</span>
@@ -154,6 +157,8 @@
             </span>
             <span class="unit" v-if="this.prescription.anticoagulant == 8">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
             <span class="unit" v-if="this.prescription.anticoagulant == 9">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 16">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 17">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
           </span>
         </li>
 
@@ -178,6 +183,8 @@
             </span>
             <span class="unit" v-if="this.prescription.anticoagulant == 8">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
             <span class="unit" v-if="this.prescription.anticoagulant == 9">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 16">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 17">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
           </span>
           <span v-else>
             <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
@@ -266,6 +273,12 @@
 
         </li>
 
+        <li v-if="isShow('血管通路部位')">
+          <label>血管通路部位: </label>
+          <span class="content">{{this.prescription.blood_access_part_id}}</span>
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('血管通路')">
           <label>血管通路: </label>
           <span class="content">{{blood_access}}</span>

src/pages/patients/editPatient.vue

@@ -67,6 +67,18 @@
         label="家属手机号"
         placeholder="请输入"
       />
+
+      <van-field
+          :class="readonly ? 'changeColor' : ''"
+          v-model="patientForm.home_address"
+          rows="1"
+          autosize
+          label="家庭地址"
+          type="textarea"
+          maxlength="50"
+          :readonly="readonly"
+          placeholder="请输入家庭地址"
+        />
       <van-cell>
         <!-- 使用 title 插槽来自定义标题 -->
         <template slot="title">
@@ -265,6 +277,8 @@
           placeholder="请输入诊疗计划"
         />
 
+       
+
       <van-field
           :class="readonly ? 'changeColor' : ''"
           v-model="patientForm.remark"
@@ -534,7 +548,9 @@ export default {
         out_reason: '',
         relative_phone: '',
         remark: '',
-        treatment_plan: ''
+        treatment_plan: '',
+        home_address:"",
+        home_telephone:"",
       },
       bloodShow: true,
       slowShow: false,
@@ -804,6 +820,12 @@ export default {
         
           this.patientForm.phone = patientdetail.phone
           this.patientForm.relative_phone = patientdetail.relative_phone
+          console.log("hahhah",this.patientForm.relative_phone)
+          if(this.patientForm.relative_phone == ""){
+            console.log("进啦为33232",patientdetail.home_telephone)
+             this.patientForm.relative_phone = patientdetail.home_telephone
+          } 
+          this.patientForm.home_address = patientdetail.home_address
 
           if (patientdetail.blood_patients == 1) {
             this.result.push(String(1))
@@ -1210,6 +1232,9 @@ export default {
           this.patientForm.patientsoure = 2
         }
       }
+      if(this.patientForm.patientsoure >2){
+         this.patientForm.patientsoure = parseInt(this.patientForm.patientsoure)
+      }
       if (this.patientForm.lapseto !== '') {
         if (this.patientForm.lapseto === '留治') {
           this.patientForm.lapseto = 1

src/router/index.js

@@ -625,6 +625,10 @@ export default new Router({
     path: '/consumablesDetail',
     component: () => import('@/pages/main/beforeDialysis/consumablesDetail')
   },
+  {
+    path: '/consumablesDetailOne',
+    component: () => import('@/pages/main/beforeDialysis/consumablesDetailOne')
+  },
   {
     path: '/adviceDetail',
     component: () => import('@/pages/main/beforeDialysis/adviceDetail')

src/store/modules/globalConfig.js

@@ -659,6 +659,96 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      32: {
+        id: 32,
+        name: 'HDP',
+        dialysis_duration: 1,
+        replacement_way: 2,
+        hemodialysis_machine: 1,
+        blood_filter: 2,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      33: {
+        id: 33,
+        name: 'HFD',
+        dialysis_duration: 1,
+        replacement_way: 2,
+        hemodialysis_machine: 1,
+        blood_filter: 2,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      34: {
+        id: 34,
+        name: 'HDF100',
+        dialysis_duration: 1,
+        replacement_way: 2,
+        hemodialysis_machine: 1,
+        blood_filter: 2,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      35: {
+        id: 35,
+        name: 'HDF600',
+        dialysis_duration: 1,
+        replacement_way: 2,
+        hemodialysis_machine: 1,
+        blood_filter: 2,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      36: {
+        id: 36,
+        name: 'HDF800',
+        dialysis_duration: 1,
+        replacement_way: 2,
+        hemodialysis_machine: 1,
+        blood_filter: 2,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      37: {
+        id: 37,
+        name: 'HDF1000',
+        dialysis_duration: 1,
+        replacement_way: 2,
+        hemodialysis_machine: 1,
+        blood_filter: 2,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
 
     },
@@ -887,6 +977,36 @@ const global_config = {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      16: {
+        id: 16,
+        name: '低分子量肝素钙',
+        type: 1,
+        shouji: 2,
+        weichi: 2,
+        zongliang: 2,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
+      17: {
+        id: 17,
+        name: '肝素钠',
+        type: 1,
+        shouji: 2,
+        weichi: 2,
+        zongliang: 2,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
       // 6: {
       //   id: 6,