Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

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

@@ -154,6 +154,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 = {}
@@ -251,7 +252,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
@@ -396,65 +397,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) {
@@ -495,9 +499,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'
             }
@@ -594,7 +602,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

@@ -23,6 +23,12 @@
           </ul>
         </div>
 
+        <!-- <div @click="openPicker()" class="time">
+                  {{pickerVisible}}<span class="iconfont">&#xe74a;</span>
+        </div>-->
+        <!-- <div class="time" style="width:1.49rem;">
+                  <span class="iconfont">2018-01-01&#xe74a;</span>
+        </div>-->
         <div class="previewBox">
           <i class="el-icon-printer printerIcon" @click="print"></i>
           <!-- <span class="preview" @click="print">预览</span> -->
@@ -34,12 +40,34 @@
       </div>
 
       <div class="Tab">
-
+        <!-- <CaseHistory v-show="index == 0" title="病历"></CaseHistory> -->
+        <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
         <dialysis-tab v-if="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
         <today-tab ref="today" v-show="index == 0 && !showView" title="今日" @show_patient_list="showPatientList"></today-tab>
+        <!-- <div v-if="showView" style="text-align:center;font-size:0.6rem;">
+          <p style="margin-top:20px;">当前叫号</p>
+          <p style="margin-top:20px;">{{ $route.query.patient_name ? $route.query.patient_name : ""}}</p>
+          <p style="margin-top:20px;">签到时间：{{ $route.query.curPatientTime ? getDates($route.query.curPatientTime) : '' }}</p>
+          <p style="color:red;margin-top:20px;">提示：当前患者无排班，请先排班</p>
+        </div> -->
       </div>
     </div>
-
+    <!-- <div class="add" @click="print">
+      <p>打印预览</p>
+    </div> -->
+    <!-- <div class="fixedCalling" v-if="queueConfig.txxqyxs == 1">
+      <div class="nowCalling">
+        <div class="callingName">{{ fisrtQueueInfo && fisrtQueueInfo.patient_name ? fisrtQueueInfo.patient_name : '暂无叫号' }}</div>
+        <p v-if="fisrtQueueInfo != null && fisrtQueueInfo.patient_name">当前叫号</p>
+      </div>
+      <div class="fixedVolume" @click="call">
+        <van-icon name="volume" />
+      </div>
+      <div class="callingName" @click="next">下一位</div>
+    </div> -->
+    <!-- <div class="callFamilyBox" @click="callFamily" v-if="queueConfig.txxqyxs == 1">
+      <img src="../../assets/images/callFamily.png" alt="">
+    </div> -->
     <div class="callFamilyBox" @click="callFamily" ref="callBtn" v-if="queueConfig.txxqyxs == 1" @touchstart="down" @mousedown="down"
       @mousemove="move"
       @touchmove="move"
@@ -48,7 +76,19 @@
       @touchcancel="end">
       <img src="../../assets/images/callFamily.png" alt="">
     </div>
-    <!-- 病人弹窗 -->
+    <!-- <div class="printBox" @click="print">
+      <img src="../../assets/images/print.png" alt="">
+    </div> -->
+    <!-- <side-bar :active_index="0"></side-bar> -->
+    <!-- <mt-datetime-picker
+            v-model="pickerVisible"
+            type="date"
+            ref="picker"
+            year-format="{value} "
+            month-format="{value} "
+            date-format="{value} ">
+    </mt-datetime-picker>-->
+
     <div class="showBox">
       <van-popup v-model="show" position="top" :style="{ height: '100%' }">
       <div
@@ -131,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>
@@ -290,12 +330,13 @@ export default {
 
     this.GetPatientInfoWithDiseases(this.patient_id)
     // this.requestDialysisScheduals()
+
     this.users.name = this.$store.getters.user.user.user_name
     this.users.id = this.$store.getters.user.admin.id
     this.users.user_type = this.$store.getters.user.user.user_type
     // console.log('this.users', this.users)
     let newScheduals = this.$store.getters.scheduals
-
+    console.log('333333333', newScheduals)
     var zoneMap = {}
     var schedualMap = {}
     for (let index = 0; index < newScheduals.scheduals.length; index++) {
@@ -454,7 +495,7 @@ export default {
       this.websocket.onmessage = e => {
         let res = JSON.parse(e.data)
         // let res = re.data;
-
+        console.log('res3333333333', res)
         if (res.channel == 'queue/join') {
           // res.data.fisrtQueueInfo.create_time = moment(res.data.fisrtQueueInfo.create_time * 1000).format('HH:mm')
           let timeType = null
@@ -509,6 +550,8 @@ export default {
               calledArr.push(item)
             }
           })
+          console.log('waitingCalledArr待叫号', waitingCalledArr)
+          console.log('waitingCalledArr以较好', calledArr)
           this.waitingCalled = waitingCalledArr
           this.called = calledArr
         } else if (res.channel == 'allQueueList') {
@@ -564,7 +607,10 @@ export default {
       let org_id = parseInt(sessionStorage.getItem('org_id'))
       let admin_user_id = parseInt(sessionStorage.getItem('admin_user_id'))
       axios.get('/api/index/callpatient?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id).then(res => {
-
+        console.log(res)
+        // let patientArr = res.data.queue_list.data
+        // this.patientArr = patientArr
+        // this.$emit('child-event',this.patientArr)
         if (res.data.code == 200) {
           Toast.success('叫号成功')
           this.curPatient = res.data.data.patientInfo
@@ -592,7 +638,10 @@ export default {
       let org_id = parseInt(sessionStorage.getItem('org_id'))
       let admin_user_id = parseInt(sessionStorage.getItem('admin_user_id'))
       axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
-
+        console.log(res)
+        // let patientArr = res.data.queue_list.data
+        // this.patientArr = patientArr
+        // this.$emit('child-event',this.patientArr)
         if (res.data.data.patientInfo == null) {
           Toast.success('已经是最后一位了')
           return
@@ -621,7 +670,7 @@ export default {
       let org_id = parseInt(sessionStorage.getItem('org_id'))
       let admin_user_id = parseInt(sessionStorage.getItem('admin_user_id'))
       axios.get('/api/index/callpatientjs?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id).then(res => {
-
+        console.log(res)
         if (res.data.code == 200) {
           Toast.success('叫号成功')
         } else {
@@ -651,11 +700,10 @@ export default {
       }
     },
     GetPatientInfoWithDiseases (id) {
-      GetPatientInfoWithDiseases(id)
-        .then(response => {
+       
+      GetPatientInfoWithDiseases(id).then(response => {
           if (response.data.state == 1) {
             this.patient = response.data.data.patient
-
           } else {
             Toast.fail(response.data.msg)
             return false
@@ -675,15 +723,16 @@ export default {
       this.$router.push('/mypatients/' + patient_id)
     },
     getScheduals (patient) {
-
+      // console.log('222222', this.$store.getters.adminUserArr.adminUserArr)
       if (this.$store.getters.adminUserArr.adminUserArr) {
-
+        // console.log('上面')
         this.getAdminUser(patient)
       } else {
-
+        // console.log('下面')
         this.dialysisGlobalConfig(patient)
       }
 
+      // console.log(222222, patient)
       this.allSearchArr = patient
 
       let newPatients = []
@@ -728,10 +777,55 @@ export default {
           }
         })
         this.patients = newObj
-
+        // console.log('所有的病人', this.patients)
       })
     },
- 
+    // requestDialysisScheduals () {
+    //   var type = 0
+    //   getDialysisScheduals({ type: type, date: parseTime(this.date, '{y}-{m}-{d}') })
+    //     .then(rs => {
+    //       var resp = rs.data
+    //       if (resp.state == 1) {
+
+    //         var patient = resp.data.scheduals
+    //         this.dialysisGlobalConfig(patient)
+    //         console.log(222222,patient)
+    //         this.allSearchArr = patient
+    //         let cityNameList = []
+    //         for (let p in patient) {
+    //           cityNameList.push(patient[p])
+    //         }
+    //         let firstName = {}
+    //         this.FirstPin.forEach(item => {
+    //           firstName[item] = []
+    //           cityNameList.forEach(el => {
+    //             let first = pinyin.getFullChars(el.patient.name).substring(0, 1)
+    //             if (first == item) {
+    //               firstName[item].push(el)
+    //             }
+    //           })
+    //           this.patients = firstName
+    //           // 判断非空
+    //           let newObj = {}
+    //           Object.keys(this.patients).map((item, index) => {
+    //             if (this.patients[item].length != 0) {
+    //               newObj[item] = this.patients[item]
+    //             }
+    //           })
+    //           this.patients = newObj
+    //         })
+    //         console.log(33333333,this.patients)
+
+    //       } else {
+    //         this.$toast({
+    //           message: resp.msg
+    //         })
+    //       }
+    //     })
+    //     .catch(error => {
+
+    //     })
+    // },
     choosePatient (schedual) {
       var patient_id = schedual.patient.id
       var date = schedual.schedule_date
@@ -749,8 +843,9 @@ export default {
       this.show = false
     },
     getAdminUser (patient) {
-    
+      // console.log('user---', this.users.user_type)
       if (this.users.user_type == 1 || this.users.user_type == 2) {
+        // console.log('触发了吗')
         let arr = []
         let zoneArr = []
         patient.map((item, index) => {
@@ -793,9 +888,12 @@ export default {
           })
           this.mypatients = newObj
         })
+        // console.log('我的病人', this.mypatients)
       } else if (this.users.user_type == 3) {
         let arr = []
         let zoneArr = []
+        console.log('武警机构ID', this.$store.getters.user.template_info.org_id)
+        console.log('9999999', patient)
 
         if (this.$store.getters.user.template_info.org_id == 10340) {
           patient.map((item, index) => {
@@ -804,12 +902,16 @@ export default {
                 arr.push(item)
               } else if (this.schedualValue == 0) {
                 if (item.patient_id == 19471) {
-
+                  console.log('item.dialysis_order.start_nurse', item.dialysis_order.start_nurse)
+                  console.log('this.users.id', this.users.id)
+                  console.log('schedule_type', item.schedule_type)
+                  console.log('this.schedualValue', this.schedualValue)
                 }
                 arr.push(item)
               }
             }
           })
+          console.log('arr0------------------', arr)
         } else {
           patient.map((item, index) => {
             if (item.dialysis_order != null && item.dialysis_order.start_nurse == this.users.id) {
@@ -829,7 +931,7 @@ export default {
             zoneArr.push(item)
           }
         })
-
+        // console.log('arr', arr)
         let cityNameList = []
         for (let p in zoneArr) {
           cityNameList.push(zoneArr[p])
@@ -853,6 +955,7 @@ export default {
           })
           this.mypatients = newObj
         })
+        console.log('我的病人', this.mypatients)
       }
     },
     dialysisGlobalConfig (patient) {
@@ -904,6 +1007,7 @@ export default {
               })
               this.mypatients = newObj
             })
+            // console.log('我的病人', this.mypatients)
           } else if (this.users.user_type == 3) {
             let arr = []
             let zoneArr = []
@@ -923,7 +1027,7 @@ export default {
                 zoneArr.push(item)
               }
             })
-
+            // console.log('arr', arr)
             let cityNameList = []
             for (let p in zoneArr) {
               cityNameList.push(zoneArr[p])
@@ -947,17 +1051,17 @@ export default {
               })
               this.mypatients = newObj
             })
-
+            // console.log('我的病人', this.mypatients)
           }
         }
       })
     },
     onSearch (val) {
+      console.log(val)
       if (this.active == 0) {
         let arr = []
         this.searchArr.map(item => {
-          if (item.patient.name.indexOf(val) != -1 ||
-          item.patient.first_letter.indexOf(val) !=-1) {
+          if (item.patient.name.indexOf(val) != -1) {
             arr.push(item)
           }
         })
@@ -987,8 +1091,7 @@ export default {
       } else if (this.active == 1) {
         let arr = []
         this.allSearchArr.map(item => {
-          if (item.patient.name.indexOf(val) != -1 ||
-          item.patient.first_letter.indexOf(val) !=-1) {
+          if (item.patient.name.indexOf(val) != -1) {
             arr.push(item)
           }
         })
@@ -1034,6 +1137,7 @@ export default {
       this.schedualTypesShow = false
     },
     chooseZone (value) {
+      console.log(value)
       this.zoneTypes = value.text
       this.zoneValue = value.id
       sessionStorage.setItem('zoneType', this.zoneValue)
@@ -1046,16 +1150,27 @@ 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
         this.calendarShow = true
@@ -1075,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',
@@ -1088,6 +1203,8 @@ export default {
           // sessionStorage.removeItem('newBarIndex')
           this.calendarShow = false
         }
+        
+       
       })
     },
     openCalendarShow () {
@@ -1105,6 +1222,7 @@ export default {
         let that = this
         setTimeout(function () {
           // 打印screenWidth变化的值
+          console.log('zhixing')
           that.timer = false
           setRem()
         }, 400)
@@ -1136,12 +1254,30 @@ export default {
     // 在渲染该组件的对应路由被 confirm 前调用
     // 不！能！获取组件实例 `this`
     // 因为当钩子执行前，组件实例还没被创建
-
+    console.log('to', to)
+    console.log('from', from)
     if (to.path == '/main') {
       sessionStorage.removeItem('newBarIndex')
     }
     next()
   }
+  // beforeRouteUpdate(to, from){
+  //   console.log(to)
+  //   if(to.query.active1 == "2" && to.active2 == undefined){
+  //     console.log(123)
+
+  //     var patient_id = to.query.patient_id;
+  //     var date = to.query.date;
+  //     var patient_name = to.query.patient_name;
+  //     this.patient_id = patient_id;
+  //     this.date = date;
+  //     this.patient_name = patient_name;
+  //     console.log(this.date)
+  //     this.GetPatientInfoWithDiseases(this.patient_id);
+  //     // this.index = parseInt(to.query.active1)
+  //   }
+  //   console.log(from)
+  // }
 }
 </script>
 
@@ -1163,6 +1299,13 @@ export default {
 .mainContent {
   // position: relative;
   .navigation {
+    // @include display-flex;
+    // @include align-items-center;
+    // @include text-align;
+    // @include box-sizing;
+    // @include justify-content-between;
+    // padding: 0.3rem 0.36rem;
+    // border-bottom: 1px #e5e5e5 solid;
     padding: 0 .625rem;
     height: 3.125rem;
     position: fixed;

src/pages/main/DialysisArea.vue

@@ -146,6 +146,7 @@
             网络异常，请点击重新加载
           </p>
 
+          <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
           <van-button
             slot="button"
             size="normal"
@@ -287,7 +288,7 @@ export default {
         }
         return schedules
       }
-      // console.log('我的患者--------------', this.ismypatient)
+      console.log('我的患者--------------', this.ismypatient)
       if (this.ismypatient) {
         var zone_selected = this.zone_selected
         var timetype_selected = this.schedual_type_selected
@@ -400,7 +401,7 @@ export default {
         }
       }
       this.zoneMapObj = zoneMap
-      // console.log('zoneMap----------------', zoneMap)
+      console.log('zoneMap----------------', zoneMap)
       var zones = []
       zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
 
@@ -411,7 +412,8 @@ export default {
       zones = zones.sort(function (a, b) {
         return a.value > b.value
       })
-  
+      // this.zones = zones
+      // console.log('zones323232332', zones)
       this.zonesList = zones
 
       var dialysis_scheduals = []
@@ -677,9 +679,32 @@ export default {
                 }
               }
             }
+        
 
             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 })
@@ -755,6 +780,44 @@ export default {
               this.zones = zones
             }
 
+            // console.log('zones', zones)
+
+            // var schedule_type_one = 0
+            // var schedule_type_two = 0
+            // var schedule_type_three = 0
+            // if (dialysis_scheduals != null && dialysis_scheduals.length > 0) {
+            //   for (let i = 0; i < dialysis_scheduals.length; i++) {
+            //     for (let j = 0; j < dialysis_scheduals[i].scheduals.length; j++) {
+            //       if (dialysis_scheduals[i].scheduals[j].schedule_type == 1) {
+            //         schedule_type_one++
+            //       }
+            //       if (dialysis_scheduals[i].scheduals[j].schedule_type == 2) {
+            //         schedule_type_two++
+            //       }
+            //       if (dialysis_scheduals[i].scheduals[j].schedule_type == 3) {
+            //         schedule_type_three++
+            //       }
+            //     }
+            //   }
+            // }
+            // var total = 0
+            // total = schedule_type_one + schedule_type_two + schedule_type_three
+
+            // for (let i = 0; i < this.schedual_types.length; i++) {
+            //   if (this.schedual_types[i].value == 0) {
+            //     this.schedual_types[i].text = this.schedual_types[i].text + '(' + total + ')'
+            //   }
+            //   if (this.schedual_types[i].value == 1) {
+            //     this.schedual_types[i].text = this.schedual_types[i].text + '(' + schedule_type_one + ')'
+            //   }
+            //   if (this.schedual_types[i].value == 2) {
+            //     this.schedual_types[i].text = this.schedual_types[i].text + '(' + schedule_type_two + ')'
+            //   }
+            //   if (this.schedual_types[i].value == 3) {
+            //     this.schedual_types[i].text = this.schedual_types[i].text + '(' + schedule_type_three + ')'
+            //   }
+            // }
+
             this.dialysis_scheduals = dialysis_scheduals
 
             this.getData()
@@ -800,7 +863,7 @@ export default {
           if (resp.state == 1) {
             this.loading = false
             var scheduals = resp.data.scheduals
-            // console.log('刷新后的数据', scheduals)
+            console.log('刷新后的数据', scheduals)
             this.$store.dispatch('SetScheduals', { scheduals: scheduals })
             this.$store.dispatch('SetWaitScheduals', { waitscheduals: scheduals })
 
@@ -853,6 +916,7 @@ export default {
             let state = false
             this.$emit('func', state)
           } else {
+            console.log('网络异常')
             this.loading = false
             let state = false
             this.$emit('func', state)
@@ -861,11 +925,13 @@ export default {
             })
           }
         }).catch(error => {
+          console.log('网络异常23332')
           this.loading = false
           // 超时之后在这里捕抓错误信息.
           if (error.response) {
             this.networkStates = false
           } else if (error.request) {
+            // console.log(error.request)
             this.networkStates = false
           } else {
             this.networkStates = false
@@ -900,6 +966,7 @@ export default {
         arr2 = JSON.parse(JSON.stringify(arr1))
       } else {
         let arr = JSON.parse(JSON.stringify(arr1))
+        // console.log('arr',arr)
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
             if (this.schedual_type_selected != arr[i].scheduals[j].schedule_type) {
@@ -927,6 +994,7 @@ export default {
                 arr[i].scheduals.splice(j--, 1)
               }
             } else if (this.$store.getters.user.user.user_type == 3) {
+              console.log('武警机构ID', this.$store.getters.user.template_info.org_id)
               if (this.$store.getters.user.template_info.org_id == 10340) {
                 if ((arr[i].scheduals[j].dialysis_order == null || ((arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order != null) ? arr[i].scheduals[j].dialysis_order.start_nurse != this.$store.getters.user.admin.id : false)) && ((arr[i].scheduals[j].dobule_check == null) || ((arr[i].scheduals[j].dobule_check != null && (arr[i].scheduals[j].dobule_check.creater != this.$store.getters.user.admin.id)) && ((arr[i].scheduals[j].dobule_check != null && (arr[i].scheduals[j].dobule_check.modifier != this.$store.getters.user.admin.id)))))) {
                   arr[i].scheduals.splice(j--, 1)
@@ -939,6 +1007,7 @@ export default {
             }
           }
         }
+        console.log('上机', newArr)
         arr3 = arr
       }
 
@@ -1023,6 +1092,7 @@ export default {
             if (arr[i].scheduals && arr[i].scheduals[j] && arr[i].scheduals[j].doctor_advice) {
               let sign = 0
               arr[i].scheduals[j].doctor_advice.map(item => {
+                console.log("待执行itmewowowowo",item.patient_id,item.execution_state)
                 if (item.execution_state == 1) {
                   sign++
                 }
@@ -1039,7 +1109,7 @@ export default {
         let arr = JSON.parse(JSON.stringify(arr3))
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
-            // console.log("arr[i]",arr[i].scheduals[j])
+            console.log("arr[i]",arr[i].scheduals[j])
             if (arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order != null && arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order.url != "") {
               arr[i].scheduals.splice(j--, 1)
             }
@@ -1094,6 +1164,7 @@ export default {
         arr2 = JSON.parse(JSON.stringify(arr1))
       } else {
         let arr = JSON.parse(JSON.stringify(arr1))
+        // console.log('arr',arr)
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
             if (this.schedual_type_selected != arr[i].scheduals[j].schedule_type) {
@@ -1112,6 +1183,7 @@ export default {
         }
       } else {
         let arr = JSON.parse(JSON.stringify(arr2))
+        console.log('arr23332232323', this.$store.getters.user.admin.id)
 
         var newArr = []
         for (let i = 0; i < arr.length; i++) {
@@ -1134,6 +1206,7 @@ export default {
             }
           }
         }
+        console.log('上机', newArr)
         arr3 = arr
       }
 
@@ -1235,6 +1308,7 @@ export default {
         let arr = JSON.parse(JSON.stringify(arr3))
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
+            console.log("arr[i]",arr[i].scheduals[j])
             if (arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order != null && arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order.url != "") {
               arr[i].scheduals.splice(j--, 1)
             }
@@ -1261,7 +1335,7 @@ export default {
           item.scheduals.sort(this.compare('sort'))
         })
       }
-      // console.log('zoneMapObj', this.zoneMapObj)
+      console.log('zoneMapObj', this.zoneMapObj)
       var zones = []
       zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
 
@@ -1296,6 +1370,7 @@ export default {
             }
           }
         }
+        console.log('zones', zones)
         this.zones = []
         this.zones = zones
       } else {
@@ -1321,9 +1396,12 @@ export default {
             }
           }
         }
+        console.log('zones', zones)
         this.zones = []
         this.zones = zones
       }
+
+      console.log('哈哈哈哈哈', arr5)
       this.allPatient = arr5
     },
     getDataTwo (index) {
@@ -1351,6 +1429,7 @@ export default {
         arr2 = JSON.parse(JSON.stringify(arr1))
       } else {
         let arr = JSON.parse(JSON.stringify(arr1))
+        // console.log('arr',arr)
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
             if (this.schedual_type_selected != arr[i].scheduals[j].schedule_type) {
@@ -1369,6 +1448,7 @@ export default {
         }
       } else {
         let arr = JSON.parse(JSON.stringify(arr2))
+        console.log('arr23332232323', this.$store.getters.user.admin.id)
 
         var newArr = []
         for (let i = 0; i < arr.length; i++) {
@@ -1379,6 +1459,7 @@ export default {
                 arr[i].scheduals.splice(j--, 1)
               }
             } else if (this.$store.getters.user.user.user_type == 3) {
+              console.log('武警机构ID', this.$store.getters.user.template_info.org_id)
               if (this.$store.getters.user.template_info.org_id == 10340) {
                 if ((arr[i].scheduals[j].dialysis_order == null || ((arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order != null) ? arr[i].scheduals[j].dialysis_order.start_nurse != this.$store.getters.user.admin.id : false)) && ((arr[i].scheduals[j].dobule_check == null) || ((arr[i].scheduals[j].dobule_check != null && (arr[i].scheduals[j].dobule_check.creater != this.$store.getters.user.admin.id)) && ((arr[i].scheduals[j].dobule_check != null && (arr[i].scheduals[j].dobule_check.modifier != this.$store.getters.user.admin.id)))))) {
                   arr[i].scheduals.splice(j--, 1)
@@ -1391,6 +1472,7 @@ export default {
             }
           }
         }
+        console.log('上机', newArr)
         arr3 = arr
       }
 
@@ -1475,6 +1557,7 @@ export default {
             if (arr[i].scheduals && arr[i].scheduals[j] && arr[i].scheduals[j].doctor_advice) {
               let sign = 0
               arr[i].scheduals[j].doctor_advice.map(item => {
+                console.log("待执行itmewowowowo",item)
                 if (item.execution_state == 1) {
                   sign++
                 }
@@ -1491,6 +1574,7 @@ export default {
         let arr = JSON.parse(JSON.stringify(arr3))
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
+            console.log("arr[i]",arr[i].scheduals[j])
             if (arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order != null && arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order.url != "") {
               arr[i].scheduals.splice(j--, 1)
             }
@@ -1517,6 +1601,43 @@ export default {
           item.scheduals.sort(this.compare('sort'))
         })
       }
+      // console.log('zoneMapObj', this.zoneMapObj)
+      // var zones = []
+      // zones.push({ value: 0, text: '全部分区' })
+
+      // for (var zoneName in this.zoneMapObj) {
+      //   zones.push({ value: this.zoneMapObj[zoneName].id, text: zoneName })
+      // }
+
+      // zones = zones.sort(function (a, b) {
+      //   return a.value > b.value
+      // })
+      // console.log('分区this.dialysis_scheduals', this.dialysis_scheduals)
+      // var total = 0
+      // for (let i = 0; i < this.dialysis_scheduals.length; i++) {
+      //   this.dialysis_scheduals[i].bedList = []
+      //   for (let j = 0; j < this.dialysis_scheduals[i].scheduals.length; j++) {
+      //     if (index == this.dialysis_scheduals[i].scheduals[j].schedule_type) {
+      //       this.dialysis_scheduals[i].bedList.push(this.dialysis_scheduals[i].scheduals[j])
+      //     }
+      //   }
+      //   total += this.dialysis_scheduals[i].bedList.length
+      // }
+      // for (let i = 0; i < zones.length; i++) {
+      //   for (let j = 0; j < this.dialysis_scheduals.length; j++) {
+      //     if (zones[i].value == 0 && total > 0) {
+      //       zones[i].text = '全部分区'
+      //       zones[i].text = zones[i].text + '(' + total + ')'
+      //     }
+      //     if (zones[i].text == this.dialysis_scheduals[j].zone_name) {
+      //       zones[i].text = zones[i].text + '(' + this.dialysis_scheduals[j].bedList.length + ')'
+      //     }
+      //   }
+      // }
+      // console.log('zones', zones)
+      // this.zones = []
+      // this.zones = zones
+      console.log('哈哈哈哈哈', arr5)
       this.allPatient = arr5
     },
     compare (property) {
@@ -1539,9 +1660,7 @@ export default {
           var filtedSchedules = []
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
             const schedule = originSchedules[s_i]
-            if (schedule.patient.name.indexOf(search_keyword) != -1 || 
-                schedule.patient.dialysis_no.indexOf(search_keyword) != -1 ||
-                schedule.patient.first_letter.indexOf(search_keyword) != -1) {
+            if (schedule.patient.name.indexOf(search_keyword) != -1 || schedule.patient.dialysis_no.indexOf(search_keyword) != -1) {
               filtedSchedules.push(schedule)
             }
           }
@@ -1592,6 +1711,8 @@ export default {
         arr1 = JSON.parse(JSON.stringify(patientArr))
       } else {
         let arr = JSON.parse(JSON.stringify(patientArr))
+        console.log('zoneList', this.zones)
+        console.log('this.zoneList[this.zone_selected].text', this.zones[this.zone_selected].zone_name)
         for (let i = 0; i < arr.length; i++) {
           if (this.zones[this.zone_selected].zone_name != arr[i].zone_name) {
             // 删除元素后改变i的值
@@ -1606,6 +1727,7 @@ export default {
         arr2 = JSON.parse(JSON.stringify(arr1))
       } else {
         let arr = JSON.parse(JSON.stringify(arr1))
+        // console.log('arr',arr)
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
             if (this.schedual_type_selected != arr[i].scheduals[j].schedule_type) {
@@ -1624,6 +1746,7 @@ export default {
         }
       } else {
         let arr = JSON.parse(JSON.stringify(arr2))
+        console.log('arr23332232323', this.$store.getters.user.admin.id)
 
         var newArr = []
         for (let i = 0; i < arr.length; i++) {
@@ -1634,6 +1757,7 @@ export default {
                 arr[i].scheduals.splice(j--, 1)
               }
             } else if (this.$store.getters.user.user.user_type == 3) {
+              console.log('woowowo', this.$store.getters.user.template_info.org_id)
               if (this.$store.getters.user.template_info.org_id == 10340) {
                 if ((arr[i].scheduals[j].dialysis_order == null || ((arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order != null) ? arr[i].scheduals[j].dialysis_order.start_nurse != this.$store.getters.user.admin.id : false)) && ((arr[i].scheduals[j].dobule_check == null) || ((arr[i].scheduals[j].dobule_check != null && (arr[i].scheduals[j].dobule_check.creater != this.$store.getters.user.admin.id)) && ((arr[i].scheduals[j].dobule_check != null && (arr[i].scheduals[j].dobule_check.modifier != this.$store.getters.user.admin.id)))))) {
                   arr[i].scheduals.splice(j--, 1)
@@ -1646,6 +1770,7 @@ export default {
             }
           }
         }
+        console.log('上机', newArr)
         arr3 = arr
       }
 

src/pages/main/PatientBox.vue

@@ -745,6 +745,7 @@
         @longSolution="longSolutionFunc"
         :admin_map="admin_user_map"
         :admin_staff="admin_staff_map"
+        :lastDialysisPrescription="lastDialysisPrescription"
         ref="prescription_dialog"
       ></prescription-dialog>
     </van-popup>
@@ -839,6 +840,7 @@
 
     <!-- 消毒弹窗 -->
     <van-popup
+      v-if="$store.getters.user.template_info.org_id!=9671"
       title="消毒时间"
       v-model="showPlan"
       class="appPopup"
@@ -874,6 +876,7 @@
             </div>
           </div>
 
+       
           <div class="item">
             <label class="name" for="dtl">消毒时长</label>
             <div class="content">
@@ -888,6 +891,7 @@
             </div>
           </div>
 
+         
           <div class="item">
             <h2 class="name">结束消毒时间</h2>
             <div class="content">
@@ -900,9 +904,96 @@
               <span class="iconfont">&#xe6f9;</span>
             </div>
           </div>
-          <!-- 选择框 -->
+        </div>
+
+        <mt-datetime-picker
+        class="double_check_dialog"
+          ref="start_time_picker"
+          type="datetime"
+          @confirm="didSelectStartTime"
+          v-model="start_time"
+        ></mt-datetime-picker>
+
+       <mt-datetime-picker
+       class="double_check_dialog"
+          ref="select_time_picker"
+          type="datetime"
+          @confirm="didSelectEndTime"
+          v-model="select_time"
+        ></mt-datetime-picker>
+
+      </div>
+    </van-popup>
+
+
+
+    <van-popup
+      v-if="$store.getters.user.template_info.org_id==9671"
+      title="消毒时间"
+      v-model="showPlan"
+      class="appPopup"
+      get-container="#app"
+      :overlay="true"
+      :close-on-click-overlay="false"
+    >
+      <div class="Dialog">
+        <div class="DialogTit">
+          <span @click="close()" class="iconfont">&#xe6e9;</span>
+          <h1 class="name">消毒时间</h1>
+          <span class="success" @click="commitInfoOne" v-show="showOne">保存</span>
+          <span class="success" @click="updateInfoOne" v-show="showTwo">修改</span>
+        </div>
+        <div class="DialogContent">
+          <div class="item">
+            <h2 class="name">{{ bed_name }}</h2>
+            <div class="content">
+              <span class="text" style="width: 100px"></span>
+            </div>
+          </div>
+
+          <div class="item">
+            <h2 class="name">开始消毒时间</h2>
+            <div class="content">
+              <span
+                class="text"
+                style="width: 100px"
+                @click="selectStartTimeAction"
+                >{{ start_time_str }}</span
+              >
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+
+       
           <div class="item">
-            <h2 class="name">选择框</h2>
+            <label class="name" for="dtl">消毒时长</label>
+            <div class="content">
+              <input
+                type="number"
+                @click="newClick($event)"
+                @focus="inputFocus"
+                id="dtl"
+                v-model="disinfec_time"
+                @change="inputBlur"
+              />
+            </div>
+          </div>
+
+         
+          <div class="item">
+            <h2 class="name">结束消毒时间</h2>
+            <div class="content">
+              <span
+                class="text"
+                style="width: 100px"
+                @click="selectEndTimeAction"
+                >{{ select_time_str }}</span
+              >
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+          <div class="item">
+            <h2 class="name">机表(床单元、床旁桌)消毒方式:</h2>
             <div class="content" @click="showPicker = true">
               <span
                 class="text"
@@ -914,7 +1005,7 @@
           </div>
 
           <div class="item">
-            <h2 class="name">选择框2</h2>
+            <h2 class="name">机表(床单元、床旁桌)消毒液:</h2>
             <div class="content" @click="showPicker2 = true">
               <span
                 class="text"
@@ -924,6 +1015,44 @@
               <span class="iconfont">&#xe6f9;</span>
             </div>
           </div>
+
+          <div class="item">
+            <h2 class="name">液路消毒方式:</h2>
+            <div class="content" @click="showPicker3 = true">
+              <span
+                class="text"
+                style="width: 100px"
+                >{{ kuangvalue3 }}</span
+              >
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+
+          <div class="item">
+            <h2 class="name">液路消毒液:</h2>
+            <div class="content" @click="showPicker4 = true">
+              <span
+                class="text"
+                style="width: 100px"
+                >{{ kuangvalue4 }}</span
+              >
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+
+          <div class="item">
+            <h2 class="name">床位更换:</h2>
+            <div class="content" @click="showPicker5 = true">
+              <span
+                class="text"
+                style="width: 100px"
+                >{{ kuangvalue5 }}</span
+              >
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+
+
         </div>
 
         <mt-datetime-picker
@@ -946,7 +1075,7 @@
         <van-popup v-model:show="showPicker" round position="bottom">
           <van-picker
             show-toolbar
-            :columns="columns"
+            :columns="disinfectType"
             placeholder="请选择"
             @cancel="showPicker=false"
             @confirm="onConfirm"
@@ -955,9 +1084,37 @@
         <van-popup v-model:show="showPicker2" round position="bottom">
           <van-picker
             show-toolbar
-            :columns="columns"
+            :columns="disinfectantType"
             @cancel="showPicker2=false"
-            @confirm="onConfirms"
+            @confirm="onConfirmOne"
+          />
+        </van-popup> 
+
+        <van-popup v-model:show="showPicker3" round position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="sterilizeType"
+            @cancel="showPicker3=false"
+            @confirm="onConfirmTwo"
+          />
+        </van-popup> 
+
+
+        <van-popup v-model:show="showPicker4" round position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="fluidPathType"
+            @cancel="showPicker4=false"
+            @confirm="onConfirmThree"
+          />
+        </van-popup> 
+
+        <van-popup v-model:show="showPicker5" round position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="bedType"
+            @cancel="showPicker5=false"
+            @confirm="onConfirmFour"
           />
         </van-popup> 
       </div>
@@ -1028,6 +1185,10 @@ export default {
       monit_dialog_reset: true,
       showPicker:false,
       showPicker2:false,
+      showPicker3:false,
+      showPicker4:false,
+      showPicker5:false,
+      showPicker6:false,
       receiver_treatment_access: {}, // 接诊评估
       predialysis_evaluation: {}, // 透前评估
       last_predialysis_evaluation: {}, // 上次透前评估
@@ -1036,6 +1197,7 @@ export default {
       double_check: {}, // 双人核对
       assessment_after_dislysis: {}, // 透后评估
       last_assessment_after_dislysis: {}, // 上次透后评估
+      lastDialysisPrescription:{},//上次透析处方，不按透析模式
       treatment_summary: {}, // 治疗小结
       monitor_records: [], // 透析监测
       special_premission: [],
@@ -1104,6 +1266,58 @@ export default {
     ],
     kuangvalue:'',
     kuangvalue2:'',
+    kuangvalue3:"",
+    kuangvalue4:"",
+    kuangvalue5:"",
+    kuangvalue6:"",
+    // 机表消毒方式
+    disinfectType: [
+      { value: 0, text: "/" },
+      { value: 1, text: "擦拭" },
+      { value: 2, text: "化学消毒" }
+    ],
+    // 基表消毒液
+    disinfectantType: [
+      { value: 0, text: "/" },
+      { value: 1, text: "0.22%季铵盐" },
+      { value: 2, text: "500mg/l含氯消毒剂" },
+      { value: 3, text: "1000mg/l含氯消毒剂" },
+      { value: 4, text: "1500mg/l含氯消毒剂" },
+      { value: 5,  text:"消毒湿巾"}
+    ],
+    // 夜路消毒方式
+    sterilizeType: [
+        { value: 0, text: "/" },
+        { value: 1, text: "热化学消毒" },
+        { value: 2, text: "化学消毒 + 除钙" },
+        { value: 3, text: "热化学消毒 + 除钙" },
+        { value: 4, text: "热消毒" },
+        { value: 5, text: "化学消毒" },
+        { value: 6, text: "除钙" },
+        { value: 7, text: "清洗" }
+      ],
+      // 夜路消毒液
+      fluidPathType: [
+        { value: 0, text: "/" },
+        { value: 1, text: "20%柠檬酸" },
+        { value: 2, text: "25%柠檬酸" },
+        { value: 3, text: "50%柠檬酸" },
+        { value: 4, text: "50%柠檬酸 + 5%次氯酸钠" },
+        { value: 5, text: "20%柠檬酸 + 10%冰醋酸" },
+        { value: 6, text: "0.2%过氧化乙酸" },
+        { value: 7, text: "10%冰醋酸" },
+        { value: 8, text: "50%冰醋酸" },
+        { value: 9, text: "5%次氯酸钠" },
+        { value: 10,text:"25%的柠檬酸+5%次氯酸钠"},
+      ],
+       // 床单位更换
+       bedType: [
+        { value: 0, text: "/" },
+        { value: 1, text: "床单" },
+        { value: 2, text: "被套" },
+        { value: 3, text: "枕套" },
+      
+      ],
     }
   },
   methods: {
@@ -1222,7 +1436,9 @@ export default {
           var last_assessment_after_dislysis =
             resp.data.last_assessment_after_dislysis // 上一次透前评估
           var last_monitor_record = resp.data.last_monitor_record
-
+          //上一次透析处方，不按透析模式
+          var lastDialysisPrescription =  resp.data.lastDialysisPrescription
+          this.lastDialysisPrescription = lastDialysisPrescription
           if (Object.keys(waitstoredata).length > 0) {
             for (let index = 0; index < waitscheduals.length; index++) {
               if (waitscheduals[index].patient_id == patient.id) {
@@ -1259,8 +1475,7 @@ export default {
           this.schedual = schedual == null ? {} : schedual
           this.prescription = prescription == null ? { id: '' } : prescription
           this.solution = solution == null ? { id: '' } : solution
-          this.last_prescription =
-            last_prescription == null ? { id: '' } : last_prescription
+          this.last_prescription = last_prescription == null ? { id: '' } : last_prescription
           this.receiver_treatment_access =
             receiver_treatment_access == null
               ? { id: '' }
@@ -2146,17 +2361,31 @@ export default {
           console.log('start_time_str', this.start_time_str)
         }
       }
+     
       var params = {
         patient_id: schedual.patient_id,
         schedule_date: schedual.schedule_date
       }
       console.log('params23232323', params)
-      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829 || this.$store.getters.user.template_info.org_id == 10490) {
+      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10101) {
         getDialysisRecordOrde(params).then((response) => {
           if (response.data.state == 1) {
             var order = response.data.data.order
             console.log('order', order)
-            this.start_time_str = this.getTimeTwo(order.end_time)
+            if(this.$store.getters.user.template_info.org_id == 10101){
+              var end_order_time = 0
+              if(order.end_time >0){
+
+                 end_order_time = parseInt(order.end_time) + 300
+              }
+              console.log(order.end_time)
+              console.log("end_order_time",end_order_time)
+              this.start_time_str = this.getTimeTwo(end_order_time)
+              console.log("开始时间",this.start_time_str)
+            }else{
+              this.start_time_str = this.getTimeTwo(order.end_time)
+            }
+          
             this.getDisInfectionTime()
             this.showPlan = true
           }
@@ -2170,6 +2399,8 @@ export default {
       this.showPlan = false
     },
     commitInfo () {
+      
+      
       const params = {
         bed_id: this.bed_id,
         start_time: this.start_time_str,
@@ -2179,8 +2410,11 @@ export default {
         zone_id: this.zone_id,
         patient_id: this.patient_id,
         mode_id: this.mode_id,
-        schedule_type: this.schedule_type
+        schedule_type: this.schedule_type,
+       
       }
+      console.log("newoowowo",params)
+      
       if (this.disinfec_time == '') {
         this.$toast('消毒时长不能为空!')
         return false
@@ -2210,6 +2444,86 @@ export default {
         }
       })
     },
+    commitInfoOne () {
+      var way = 0
+      for(let i=0;i<this.disinfectType.length;i++){
+        if(this.kuangvalue == this.disinfectType[i].text){
+           way = this.disinfectType.value
+        }
+      }
+      var machine_disinfectant =0 
+      for(let i=0;i<this.disinfectantType.length;i++){
+          if(this.kuangvalue2 == this.disinfectType[i].text){
+            machine_disinfectant = this.disinfectType[i].value
+          }
+      }
+
+      var disinfectant_way = 0
+      for(let i=0;i<this.sterilizeType.length;i++){
+        if(this.kuangvalue3 == this.sterilizeType[i].text){
+           disinfectant_way = this.sterilizeType[i].value
+        }
+      }
+
+      var disinfectant=0
+      for(let i=0;i<this.fluidPathType.length;i++){
+         if(this.kuangvalue4 == this.fluidPathType[i].text){
+            disinfectant = this.fluidPathType[i].value
+         }
+      }
+
+      var bed_way =0
+      for(let i=0;i<this.bedType.length;i++){
+        if(this.kuangvalue5 == this.bedType[i].text){
+            bed_way== this.fluidPathType[i].bedType
+        }
+      }
+
+      const params = {
+        bed_id: this.bed_id,
+        start_time: this.start_time_str,
+        disinfec_time: this.disinfec_time,
+        end_time: this.select_time_str,
+        schedule_date: this.schedule_date,
+        zone_id: this.zone_id,
+        patient_id: this.patient_id,
+        mode_id: this.mode_id,
+        schedule_type: this.schedule_type,
+        way:way,
+        machine_disinfectant:machine_disinfectant,
+        disinfectant_way:disinfectant_way,
+        disinfectant:disinfectant,
+        bed_way:bed_way,
+      }
+      if (this.disinfec_time == '') {
+        this.$toast('消毒时长不能为空!')
+        return false
+      }
+      if (this.planStatus == 1) {
+        this.$toast('该设备无消毒计划,保存失败!')
+        return false
+      }
+      console.log('params', params)
+      
+      SaveDisinfetionInfo(params).then((response) => {
+        if (response.data.state == 1) {
+          var information = response.data.data.information
+
+          this.$toast('保存成功')
+          this.showPlan = false
+          var msstatus = response.data.data.msstatus
+          // console.log('inforstate', msstatus)
+          this.$parent.getDeviceInformation()
+          if (msstatus == 2) {
+            this.showPlan = false
+            this.$toast('保存失败,该设备无消毒计划')
+          }
+        } else {
+          this.showPlan = false
+          this.$toast('保存失败')
+        }
+      })
+    },
     updateInfo () {
       var u = navigator.userAgent
       var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1 // android终端
@@ -2242,6 +2556,38 @@ export default {
         }
       })
     },
+    updateInfoOne () {
+      var u = navigator.userAgent
+      var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1 // android终端
+      var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) // ios终端
+      const params = {
+        bed_id: this.bed_id,
+        start_time: this.start_time_str,
+        disinfec_time: this.disinfec_time,
+        end_time: this.select_time_str,
+        schedule_date: this.schedule_date,
+        zone_id: this.zone_id,
+        patient_id: this.patient_id,
+        mode_id: this.mode_id,
+        schedule_type: this.schedule_type
+      }
+      if (this.disinfec_time == '') {
+        this.$toast('消毒时长不能为空!')
+        return false
+      }
+      // console.log("params",params)
+      SaveDisinfetionInfo(params).then((response) => {
+        if (response.data.state == 1) {
+          var information = response.data.data.information
+
+          this.$toast('修改成功')
+          this.showPlan = false
+        } else {
+          this.showPlan = false
+          this.$toast('修改失败')
+        }
+      })
+    },
     selectStartTimeAction: function () {
       this.$refs.start_time_picker.open()
     },
@@ -2300,20 +2646,55 @@ export default {
           var plan = response.data.data.plan
 
           this.disinfec_time = plan
+         
+          // var planObj = response.data.data.planObj
+          // if(planObj!="" && planObj!=undefined){
+          //   var way = ""
+          //   for(let i=0;i<this.disinfectType.length;i++){
+          //     if(planObj.way == this.disinfectType[i].value){
+          //        way = this.disinfectantType[i].text
+          //     }
+          //   }
+          //   this.kuangvalue =way
+
+          //   var machine_disinfectant = ""
+          //   for(let i=0;i<this.disinfectantType.length;i++){
+          //       if(planObj.device_type == this.disinfectType[i].value){
+          //         machine_disinfectant = this.disinfectType[i].text
+          //       }
+          //   }
+          //   this.kuangvalue2 = machine_disinfectant
+
+          //   var disinfectant_way = ""
+          //   for(let i=0;i<this.sterilizeType.length;i++){
+          //     if(planObj.sterilizeType == this.sterilizeType[i].text){
+          //       disinfectant_way = this.sterilizeType[i].text 
+          //     }
+          //   }
+          //   this.kuangvalue3 = disinfectant_way
+
+          //   var disinfectant=""
+          //   for(let i=0;i<this.fluidPathType.length;i++){
+          //     if(planObj.disinfectant == this.fluidPathType[i].value){
+          //        disinfectant = this.fluidPathType[i].text
+          //     }
+          //   }
+          //   this.kuangvalue4 = disinfectant
+           
+          //   var bed_type = ""
+          //   for(let i=0;i<this.bedType.length;i++){
+          //     if(planObj.bed_way == this.bedType[i].value){
+          //        bed_type = this.bedType[i].text
+          //     }
+          //   }
+          //   this.kuangvalue5 =bed_type
+           
+          // }
           var total = 60 * parseInt(this.disinfec_time) + new Date(this.start_time_str).valueOf() / 1000
           console.log('total', total)
           this.select_time_str = this.getTimeTwo(total)
           this.select_time = this.getTimeTwo(total)
-          // let oldTime = this.start_time_str
-          // console.log('oldTime2333232', oldTime)
-          // var time = new Date(oldTime.replace('-', '/'))
-          // var b = parseInt(plan) // 分钟数
-          // time.setMinutes(time.getMinutes() + b)
-          // console.log('time2233323232', time)
-          // this.end_time = parseTime(time, '{y}-{m}-{d} {h}:{i}')
-          // this.select_time = parseTime(time, '{y}-{m}-{d} {h}:{i}')
-          // this.select_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}')
-          // console.log('数据2323322232', this.select_time_str)
+        
           if (plan == '') {
             this.end_time = ''
             this.select_time = ''
@@ -2386,6 +2767,21 @@ export default {
       console.log('total', total)
       this.select_time_str = this.getTimeTwo(total)
       this.select_time = this.getTimeTwo(total)
+
+      // let oldTime = this.start_time_str
+      // var time = new Date(oldTime.replace('-', '/'))
+      // var b = parseInt(this.disinfec_time) // 分钟数
+      // time.setMinutes(time.getMinutes() + b)
+
+      // this.end_time = ''
+      // this.end_time = parseTime(time, '{y}-{m}-{d} {h}:{i}')
+      // this.end_time_one = ''
+      // this.end_time_one = parseTime(time, '{y}-{m}-{d} {h}:{i}')
+
+      // this.select_time = parseTime(time, '{y}-{m}-{d} {h}:{i}')
+      // console.log('select_time23323233223', this.select_time)
+      // this.select_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}')
+      // console.log('select_time_str', this.select_time_str)
     },
     modeColor (id) {
       if (id == 1) {
@@ -2426,32 +2822,55 @@ export default {
       this.patients.splice(index, 1)
     },
     onConfirm(val){
-      
-      for(let i=0;i<this.columns.length;i++){
-        if(val.value==this.columns[i].value){
+      console.log("val2o2o2o2o",val)
+      for(let i=0;i<this.disinfectType.length;i++){
+        if(val.id==this.disinfectType[i].id){
           this.kuangvalue=val.text
-          console.log('vvvv',this.kuangvalue)
         }
       }
       this.showPicker=false
     },
-    onConfirms(val){
-      for(let i=0;i<this.columns.length;i++){
-        if(val.value==this.columns[i].value){
+    onConfirmOne(val){
+      for(let i=0;i<this.disinfectantType.length;i++){
+        if(val.id==this.disinfectantType[i].id){
           this.kuangvalue2=val.text
-          console.log('vvvv',this.kuangvalue2)
         }
       }
       this.showPicker2=false
+    },
+    onConfirmTwo(val){
+      for(let i=0;i<this.sterilizeType.length;i++){
+        if(val.id==this.sterilizeType[i].id){
+          this.kuangvalue3=val.text
+        }
+      }
+      this.showPicker3=false
+    },
+    onConfirmThree(val){
+      for(let i=0;i<this.fluidPathType.length;i++){
+        if(val.id==this.fluidPathType[i].id){
+          this.kuangvalue4=val.text
+        }
+      }
+      this.showPicker4=false
+    },
+    onConfirmFour(val){
+      for(let i=0;i<this.bedType.length;i++){
+        if(val.id==this.bedType[i].id){
+          this.kuangvalue5=val.text
+        }
+      }
+      this.showPicker5=false
     }
 
+
   },
   created () {
-    // console.log("thiso2ooow",this.newIndex)
+    console.log("thiso2ooow",this.newIndex)
     if (this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 9829 &&  this.$store.getters.user.template_info.org_id != 10490) {
       this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}')
       this.select_time_str = parseTime(this.select_time, '{y}-{m}-{d} {h}:{i}')
-      // console.log('this.select_time_str3232323', this.select_time_str)
+      console.log('this.select_time_str3232323', this.select_time_str)
       
     }
   },

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>
@@ -154,7 +154,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'
 import beforeDialysis from './beforeDialysis/index'
@@ -249,7 +249,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>
@@ -111,6 +111,7 @@
           v-if="!networkStates"
           style="display: block;text-align: center;"
         >
+          <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
           <p style="margin-top: 100px;font-size: 18px">
             网络异常，请点击重新加载
           </p>
@@ -214,6 +215,9 @@ export default {
       information: [],
       deviceTypeList:[],
       schedualsLength: 0,
+      schedualsLengthOne:0,
+      schedualsLengthTwo:0,
+      schedualsLengthThree:0,
       zonesList: [],
       zoneMap: {}
     }
@@ -271,7 +275,14 @@ export default {
               }
             }
           }
-        }
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
+        }
+        // console.log(filtedSchedules)
         return this.processScheduals(filtedSchedules)
       }
 
@@ -306,7 +317,14 @@ export default {
               }
             }
           }
-        }
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
+        }
+        // console.log(222, filtedSchedules)
         return this.processScheduals(filtedSchedules)
       }
 
@@ -338,8 +356,90 @@ export default {
               }
             }
           }
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
         }
+
+        // console.log(111, filtedSchedules)
         return this.processScheduals(filtedSchedules)
+        // eslint-disable-next-line no-unreachable
+        if (this.select_index == 2) {
+          var scheduals = []
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index]
+            if (
+              schedual.assessment_before_dislysis == null ||
+              schedual.assessment_before_dislysis.weight_before == 0
+            ) {
+              if (
+                this.cur_zone_selected > 0 &&
+                schedual.device_number.zone.id != this.cur_zone_selected
+              ) {
+                continue
+              }
+              if (
+                timetype_selected > 0 &&
+                schedual.schedule_type != timetype_selected
+              ) {
+                continue
+              }
+              scheduals.push(schedual)
+            }
+          }
+          return this.processScheduals(scheduals)
+          // return scheduals;
+        } else if (this.select_index == 1) {
+          var scheduals = []
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index]
+            if (
+              schedual.prescription == null ||
+              schedual.prescription.creater == 0
+            ) {
+              if (
+                this.cur_zone_selected > 0 &&
+                schedual.device_number.zone.id != this.cur_zone_selected
+              ) {
+                continue
+              }
+              if (
+                timetype_selected > 0 &&
+                schedual.schedule_type != timetype_selected
+              ) {
+                continue
+              }
+              scheduals.push(schedual)
+            }
+          }
+          // return scheduals;
+          return this.processScheduals(scheduals)
+        } else {
+          var scheduals = []
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index]
+            if (schedual.dialysis_order == null) {
+              if (
+                this.cur_zone_selected > 0 &&
+                schedual.device_number.zone.id != this.cur_zone_selected
+              ) {
+                continue
+              }
+              if (
+                timetype_selected > 0 &&
+                schedual.schedule_type != timetype_selected
+              ) {
+                continue
+              }
+              scheduals.push(schedual)
+            }
+          }
+          // return scheduals;
+          return this.processScheduals(scheduals)
+        }
       }
 
       if (this.select_index == 2) {
@@ -394,6 +494,7 @@ export default {
     var time = getSelectedTimesDataConfigList()
     var type = getWaitTypeSelectedConfig()
     var patientType = getPatientTypeSelectedConfig()
+    // console.log('type',type)
     if (area != null) {
       this.zone_options_visible = false
       this.zone_selected = parseInt(area)
@@ -414,8 +515,9 @@ export default {
     }
 
     var storedata = this.$store.getters.waitscheduals
+    // console.log('storedata', storedata)
     var scheduals = storedata.waitscheduals
-
+    // console.log('scheduals', scheduals)
 
     if (Object.keys(storedata).length > 0) {
       var totalCount = scheduals.length
@@ -434,7 +536,7 @@ export default {
       // this.menuList[1].count = prescription_count;
       this.scheduals = scheduals
 
-      // console.log('scheduals99999999', this.scheduals)
+      console.log('scheduals99999999', this.scheduals)
       var zoneMap = {}
       var schedualMap = {}
       for (let index = 0; index < scheduals.length; index++) {
@@ -509,7 +611,8 @@ export default {
       this.zone_options = []
      
       this.zone_options = zones
-      // console.log('dialysis_scheduals33223322323', dialysis_scheduals)
+      // eslint-disable-next-line camelcase
+      console.log('dialysis_scheduals33223322323', dialysis_scheduals)
 
       this.zone_scheduals = dialysis_scheduals
 
@@ -574,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 {
@@ -634,6 +746,8 @@ export default {
               calledArr.push(item)
             }
           })
+          // console.log('waitingCalledArr待叫号',waitingCalledArr)
+          // console.log('waitingCalledArr以较好',calledArr)
           this.waitingCalled = waitingCalledArr
           this.called = calledArr
         } else if (res.channel == 'allQueueList') {
@@ -690,6 +804,7 @@ export default {
         }
       },
       this.websocket.onerror = function (event, e) {
+        // console.log('error '+event.data);
         let unObj = {
           cmd: 'queue/unjoin',
           data: {type: 3}
@@ -714,9 +829,11 @@ export default {
       } else {
         schedule_type = 2
       }
+      // console.log('patient_id',patient_id)
       let org_id = parseInt(sessionStorage.getItem('org_id'))
       let admin_user_id = parseInt(sessionStorage.getItem('admin_user_id'))
       axios.get('/api/index/callpatient?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
+        // console.log(res)
         // let patientArr = res.data.queue_list.data
         // this.patientArr = patientArr
         // this.$emit('child-event',this.patientArr)
@@ -730,6 +847,7 @@ export default {
         Toast.success('已经是最后一位了')
         return
       }
+      // console.log('patient_id',patient_id)
       let schedule_type = null
       if (this.time_selected == 0) {
         if (new Date().getHours() < 11) {
@@ -745,6 +863,7 @@ export default {
       let org_id = parseInt(sessionStorage.getItem('org_id'))
       let admin_user_id = parseInt(sessionStorage.getItem('admin_user_id'))
       axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
+        // console.log(res)
         // let patientArr = res.data.queue_list.data
         // this.patientArr = patientArr
         // this.$emit('child-event',this.patientArr)
@@ -851,7 +970,7 @@ export default {
       this.getData()
     },
     handleZoneChange: function (index, zone) {
-      // console.log('中国232322323', zone)
+      console.log('中国232322323', zone)
       this.zone_options_visible = false
       this.zone_selected = index
       this.cur_zone_selected = zone.value
@@ -862,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}
@@ -877,11 +996,21 @@ export default {
     },
 
     requestScheduals: function () {
+      // this.loading = true;
+      // var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
+      // getWaitingScheduals({ date: date }).then(rs => {
+      // var resp = rs.data
+      // if (resp.state == 1) {
+
       this.loading = false
       var storedata = this.$store.getters.waitscheduals
 
       var scheduals = storedata.waitscheduals
-      // console.log('我的时间我做主', scheduals)
+      console.log('我的时间我做主', scheduals)
+      // var scheduals = resp.data.scheduals
+      // this.$store.dispatch('SetWaitScheduals', {
+      //   waitscheduals: scheduals
+      // })
       var totalCount = scheduals.length
       var prescription_count = 0
       var assessment_before_dislysis_count = 0
@@ -894,6 +1023,8 @@ export default {
           prescription_count += 1
         }
       }
+      // this.menuList[2].count = assessment_before_dislysis_count;
+      // this.menuList[1].count = prescription_count;
       this.scheduals = scheduals
 
       var zoneMap = {}
@@ -939,6 +1070,10 @@ export default {
         }
       }
       this.zonesList = zones
+
+      // this.zone_options = zones
+
+      // eslint-disable-next-line camelcase
       var dialysis_scheduals = []
       for (let index = 0; index < zones.length; index++) {
         const zone = zones[index]
@@ -965,13 +1100,42 @@ export default {
         }
       }
       this.zone_options = []
+      console.log('zones33223232332', zones)
       this.zone_options = zones
 
       this.zone_scheduals = dialysis_scheduals
-      // this.getData()
-      // return 
+      this.getData()
+
+      // this.zone_options = this.makeZones(scheduals);
+      // this.zone_scheduals = this.processScheduals(scheduals);
+      // console.log('this.zone_options',this.zone_options)
+      // console.log('this.zone_scheduals',this.dialysis_scheduals)
+      // } else {
+      //   this.loading = false
+
+      //   this.$toast({
+      //     message: resp.msg
+      //   })
+      // }
+      // }).catch(error => {
+      //     this.loading = false
+
+      //     // 超时之后在这里捕抓错误信息.
+      //     if (error.response) {
+      //       this.networkStates = false
+      //     } else if (error.request) {
+      //       this.networkStates = false
+      //       // if(error.request.readyState == 4 && error.request.status == 0){
+      //       //   //我在这里重新请求
+      //       //   this.networkStates = false
+      //       // }
+      //     } else {
+      //       this.networkStates = false
+      //     }
+      //   })
     },
     makeZones: function (scheduals) {
+      console.log('schedualsjianmie', scheduals)
       var zoneMap = {}
       for (let index = 0; index < scheduals.length; index++) {
         const schedual = scheduals[index]
@@ -986,6 +1150,7 @@ export default {
       for (var zoneId in zoneMap) {
         zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name, zone_name: zoneMap[zoneId].name })
       }
+      console.log('zones233223232wi', zones)
       return zones
     },
     getData () {
@@ -1036,8 +1201,9 @@ export default {
 
         arr2 = arr
       }
-      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) {
-
+      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 || 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 => {
             it.sort = parseInt(it.device_number.sort)
@@ -1047,6 +1213,9 @@ export default {
           item.scheduals.sort(this.compareOne('sort'))
         })
       }
+      console.log('机构ID', this.$store.getters.user.template_info.org_id)
+      console.log('this.zone_selected', this.zone_selected)
+      console.log('热爱生活', arr2)
       let arr3 = []
       if (this.zone_selected == 0) {
         arr3 = JSON.parse(JSON.stringify(arr2))
@@ -1097,8 +1266,10 @@ 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)
+        console.log('arr4', arr4)
       } else {
         this.allPatient = arr4
       }
@@ -1117,6 +1288,7 @@ export default {
     },
 
     getDataOne (index) {
+      console.log("寄哪里地我哦我我",this.patient_selected)
       this.menuList[1].count = 0
       let patientArr = this.zone_scheduals
 
@@ -1128,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++) {
@@ -1152,6 +1328,7 @@ export default {
             }
           }
         }
+        console.log('zones232332233', zones)
         this.zone_options = []
         this.zone_options = zones
       } else {
@@ -1159,6 +1336,7 @@ export default {
         for (let i = 0; i < this.zone_scheduals.length; i++) {
           this.zone_scheduals[i].bedList = []
           for (let j = 0; j < this.zone_scheduals[i].scheduals.length; j++) {
+            console.log('999988wo', this.zone_scheduals[i].scheduals[j].schedule_type, this.zone_scheduals[i].scheduals[j].schedule_type)
             if (this.zone_scheduals[i].scheduals[j].schedule_type == 1 || this.zone_scheduals[i].scheduals[j].schedule_type == 2 || this.zone_scheduals[i].scheduals[j].schedule_type == 3) {
               this.zone_scheduals[i].bedList.push(this.zone_scheduals[i].scheduals[j])
             }
@@ -1177,6 +1355,7 @@ export default {
             }
           }
         }
+        console.log('zones9999999999999999', zones)
         this.zone_options = []
         this.zone_options = zones
       }
@@ -1195,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++) {
@@ -1245,6 +1426,7 @@ export default {
         arr4 = JSON.parse(JSON.stringify(arr3))
       } else {
         let arr = JSON.parse(JSON.stringify(arr3))
+        // console.log('arr',arr)
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
             if (this.time_selected != arr[i].scheduals[j].schedule_type) {
@@ -1267,15 +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
       }
 
@@ -1311,11 +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 ||
-              schedual.patient.first_letter.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 {
@@ -1324,6 +1523,7 @@ export default {
     },
 
     getDataTwo () {
+      console.log("patient_selected",this.patient_selected)
       this.menuList[1].count = 0
       let patientArr = this.zone_scheduals
 
@@ -1370,11 +1570,14 @@ export default {
         }
         arr2 = arr
       }
+      console.log('this.zone_selected', this.zone_selected)
+      console.log('arr2', arr2)
       let arr3 = []
       if (this.zone_selected == 0) {
         arr3 = JSON.parse(JSON.stringify(arr2))
       } else {
         let arr = JSON.parse(JSON.stringify(arr2))
+       
         for (let i = 0; i < arr.length; i++) {
           if (this.zone_options[this.zone_selected].zone_name != arr[i].zone_name) {
             // 删除元素后改变i的值
@@ -1389,6 +1592,7 @@ export default {
         arr4 = JSON.parse(JSON.stringify(arr3))
       } else {
         let arr = JSON.parse(JSON.stringify(arr3))
+        // console.log('arr',arr)
         for (let i = 0; i < arr.length; i++) {
           for (let j = 0; j < arr[i].scheduals.length; j++) {
             if (this.time_selected != arr[i].scheduals[j].schedule_type) {
@@ -1420,6 +1624,7 @@ export default {
           arr4[0].scheduals.sort(this.compareOne('sort'))
         }
         this.allPatient = arr4
+        console.log('arr4', arr4)
       } else {
         this.allPatient = arr4
       }
@@ -1450,7 +1655,21 @@ export default {
 .screening {
   border-bottom: 1px #e5e5e5 solid;
   width: 100%;
+  // position: fixed;
+  // top: 86px;
+  // @media only screen and (min-width: 768px) {
+  //   top: 143px;
+  // }
+  // @media only screen and (min-width: 415px) and (max-width: 767px) {
+  //   top: 114px;
+  // }
+  // right: 0;
+  // z-index: 66;
+  // left: 0;
   background: #fff;
+  // @media only screen and (max-width: 812px) {
+  //   top: 50px !important;
+  // }
   ul {
     @include display-flex;
     @include align-items-center;

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++) {
@@ -43,9 +46,128 @@
               desc = desc + " " + good_user[b].info.specification_name + "*" + good_user[b].count
           }
           return desc
+          // } else if (good_user.length <= 0) {
+          //   if (last_good_user != null && last_good_user.length > 0) {
+          //     let desc = ""
+          //     for (let b = 0; b < last_good_user.length; b++){
+          //       if(good_type_id == last_good_user[b].good_type_id)
+          //         desc = desc + " " + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
+          //     }
+          //     return desc
+          //
+          //   }
+          //   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();
+      //   var y = newDate.getFullYear();
+      //   var m = newDate.getMonth() + 1;
+      //   var d = newDate.getDate();
+      //   var schedule_date =
+      //     y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
+      //   let params = {
+      //     schedule_date:schedule_date,
+      //     schedule_type:0,
+      //     partition_id:0,
+      //     page:1,
+      //   }
+      //   getDialysisGoods(params).then(rs => {
+      //     var res = rs.data
+      //     if (res.state == 1) {
+      //       this.list = []
+      //       for(let i = 0; i < res.data.dialysis_goods.length; i++){
+      //           let arr =[]
+      //           let obj = {
+      //             id:0,
+      //             name:"姓名：" + res.data.dialysis_goods[i].patient.name
+      //           }
+      //           arr.push(obj)
+      //
+      //           for (let a = 0; a <  res.data.good_type.length; a++){
+      //             let obj = {
+      //               id:res.data.good_type[a].id,
+      //               name:res.data.good_type[a].type_name,
+      //             }
+      //             arr.push(obj)
+      //           }
+      //         this.list.push(arr)
+      //
+      //       }
+      //
+      //       var zoneMap = {}
+      //       var schedualMap = {}
+      //       for (let index = 0; index < res.data.dialysis_goods.length; index++) {
+      //         const schedual = res.data.dialysis_goods[index]
+      //         if (schedual.dialysis_order == null) {
+      //           continue
+      //         }
+      //         if (schedualMap[schedual.device_number.zone.name] == null) {
+      //           schedualMap[schedual.device_number.zone.name] = []
+      //         }
+      //         schedualMap[schedual.device_number.zone.name].push(schedual)
+      //         if (zoneMap[schedual.device_number.zone.name] == null) {
+      //           zoneMap[schedual.device_number.zone.name] =
+      //             schedual.device_number.zone
+      //         }
+      //       }
+      //
+      //       var zones = []
+      //       zones.push({ value: 0, text: '全部分区' })
+      //       for (var zoneName in zoneMap) {
+      //         zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+      //       }
+      //
+      //       zones = zones.sort(function (a, b) {
+      //         return a.value > b.value
+      //       })
+      //       this.zones = zones
+      //       // console.log('this.zones',this.zones)
+      //
+      //       // eslint-disable-next-line camelcase
+      //       var dialysis_scheduals = []
+      //       for (let index = 0; index < zones.length; index++) {
+      //         const zone = zones[index]
+      //         // eslint-disable-next-line no-redeclare
+      //         var scheduals = schedualMap[zone.text]
+      //         if (scheduals == null) {
+      //           continue
+      //         }
+      //         dialysis_scheduals.push({
+      //           zone_name: zone.text,
+      //           scheduals: scheduals
+      //         })
+      //       }
+      //
+      //
+      //
+      //     }
+      //   })
+      //
+      //
+      // },
       onLoad() {
         // 异步更新数据
         // setTimeout 仅做示例，真实场景中一般为 ajax 请求
@@ -60,11 +182,16 @@
         }, 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() {
-      //  console.log("元旦",this.list)
+       console.log("元旦",this.list)
      
     }
   }

src/pages/main/beforeDialysis/index.vue

@@ -271,7 +271,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

@@ -417,8 +417,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/dialog/subMenu/dryWeightMenu.vue

@@ -98,6 +98,7 @@ export default {
     open() {
       this.creator = this.$store.getters.user.admin.id;
       this.dry_weight = this.propsForm.weight;
+      this.remark = this.propsForm.remark
       this.visibility = true;
     },
     close() {

src/pages/main/newActionBar/assessmentAfter.vue

@@ -618,6 +618,7 @@ export default {
     }
   },
   created () {
+    console.log("中国",this.record.weight_loss)
     this.getPermission()
     let initHour = ''
     let initMinute = ''
@@ -626,6 +627,7 @@ export default {
     this.template_id = this.$store.getters.user.template_info.template_id
     this.leaveOfficeList = getDataConfig('hemodialysis', 'leave_office_method')
     this.consciousnessList = getDataConfig('hemodialysis', 'consciousness')
+    console.log('意识', this.consciousnessList)
     this.fallriskList = getDataConfig('hemodialysis', 'fallrisk')
     this.bloodFlowList = getDataConfig('hemodialysis', 'blood_flow')
     this.lapseList = getDataConfig('hemodialysis', 'lapse')
@@ -644,11 +646,12 @@ export default {
         this.predialysis['additional_weight'].toString()
       )
     }
-   
+    console.log('h233232233223recoe', this.record)
     if (this.record != null && this.record.id != '') {
       this.formValue.actual_ultrafiltration = this.record.actual_ultrafiltration
       this.formValue.weight_loss = this.record.weight_loss
     } else {
+      console.log('last_record3232323232', this.last_record)
       if (this.last_record != null && this.last_record.id > 0) {
         for (var key in this.last_record) {
           if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after' && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' && key != 'remark') {
@@ -658,11 +661,13 @@ export default {
         }
       }
     }
+    console.log('小时2332322323', this.formValue.actual_treatment_hour)
     if (typeof this.formValue.actual_treatment_hour === 'undefined') {
       tempHour = ''
       initHour = '00'
     } else {
       tempHour = this.formValue.actual_treatment_hour + '小时'
+      console.log('23323232233', tempHour)
       if (parseInt(this.formValue.actual_treatment_hour) < 10) {
         initHour = '0' + this.formValue.actual_treatment_hour
       } else {
@@ -684,6 +689,7 @@ export default {
 
     this.time = initHour + ':' + initMinute
     this.timeValue = tempHour + tempMinute
+    console.log('timeValue33232323232', this.timeValue)
     var date = this.$route.query && this.$route.query.date
     date *= 1000
     var newDate = new Date(date)
@@ -710,11 +716,17 @@ export default {
       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)
+
     if (this.record != null && this.record != undefined) {
       this.formValue.actual_ultrafiltration = this.record.actual_ultrafiltration
       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
       }
@@ -726,6 +738,10 @@ export default {
       if(this.$store.getters.user.template_info.org_id==10138 || this.$store.getters.user.template_info.org_id==10278 ||  this.$store.getters.user.template_info.org_id==0 || this.$store.getters.user.template_info.org_id==3877 || this.$store.getters.user.template_info.org_id==10551 || this.$store.getters.user.template_info.org_id==10558 || this.$store.getters.user.template_info.org_id==10515){
           this.formValue.additional_weight = this.predialysis.additional_weight
       }
+      if(this.$store.getters.user.template_info.org_id==10551){
+         this.formValue.dialysis_intakes = 0
+      }
+      console.log("干体重",this.formValue.additional_weight)
     }
 
   },
@@ -1428,15 +1444,21 @@ export default {
               newArr.push(arr1[j]);
           }
         }
+        // console.log(newArr,'newArr')
       }
        return newArr;
     },
 
     open_tips(info) {
-
+      // console.log(info, "oo");
       for (let i = 0; i < info.length; i++) {
         if (info[i].is_write == 1) {
-
+          // Dialog.alert({
+          //   title: "必填提示",
+          //   message: `${info[i].filed_name_cn}为必填字段，不能为空`,
+          // }).then(() => {
+          //   // on close
+          // });
           Toast.fail(`${info[i].filed_name_cn}为必填字段，不能为空`)
         }
       }
@@ -1462,6 +1484,7 @@ export default {
         this.formValue.actual_treatment_hour == ''&&
         this.formValue.actual_treatment_minute == '')
         {
+          console.log('实际治疗时长',this.formValue.actual_treatment_hour);
         Toast.fail(`实际治疗时长为必填字段，不能为空`)
       } else if (this.isCommit == true) {
 
@@ -1475,8 +1498,12 @@ export default {
             ParamsQuery['mode'] = '3'
           }
         }
+        console.log('pramsquery', ParamsQuery)
+
+        console.log("params----------",ParamsQuery)
         let newParams = ParamsQuery;
         // 必填弹窗开始
+        console.log(newParams, "提交的参数");
         if(newParams.dialysis_process != 2){
             delete newParams.in_advance_minute
             delete newParams.in_advance_reason
@@ -1500,9 +1527,11 @@ export default {
               result.unshift(el)
             }
           });
-  
+          console.log(result, "提交的参数当中过滤出为空的");
+          console.log(this.getArrEqual(filedList, result));
           let warnarr = [];
           warnarr = this.getArrEqual(filedList, result);
+          console.log("warenarr23323232",warnarr)
           if (warnarr.length > 0) {
             this.open_tips(warnarr);
             // 必填弹窗结束
@@ -1516,10 +1545,11 @@ export default {
             if(ParamsQuery.breathing_rate!=undefined){
               ParamsQuery.breathing_rate = ParamsQuery.breathing_rate.toString()
             }
-
+            console.log("param2332233232",ParamsQuery)
             commitAssessmentAfterDislysis(ParamsQuery).then(response => {
-
+              console.log("hhhh2h2h2h",response.data.state)
             if (response.data.state == 0) {
+              console.log("o2o3o32o2323oo32")
               Toast.fail(response.data.msg)
               this.isCommit = true
               if(response.data.code == 600000008){
@@ -1720,7 +1750,8 @@ export default {
           }
         })
         .then(res => {
-
+          console.log(res)
+          console.log('透后', this.predialysis)
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {
@@ -1820,6 +1851,7 @@ export default {
 
         // this.formValue.weight_loss = (this.predialysis.weight_before - this.predialysis.additional_weight) - (this.formValue.weight_after - this.formValue.additional_weight)
         this.formValue.weight_loss = ((this.predialysis.weight_before - this.predialysis.additional_weight) - (this.formValue.weight_after - this.formValue.additional_weight)).toFixed(1)
+        console.log('sssss', this.formValue.weight_loss)
         if (this.formValue.weight_loss < 0) {
           this.formValue.weight_loss = ''
         }

src/pages/main/newActionBar/assessmentBefore.vue

@@ -602,7 +602,8 @@ data () {
     thromubusShow: false,
     propDryForm: {
       weight: 0,
-      doctor: []
+      doctor: [],
+      remark:""
     },
     dry_visibility: false,
 
@@ -660,7 +661,7 @@ created () {
   this.edema_arr = getDataConfig('hemodialysis', 'edema')
   this.catheter_maintenance_arr = getDataConfig('hemodialysis', 'catheter_maintenance')
   this.suctionList = getDataConfig('hemodialysis', 'suction')
-  // console.log('2323322323', this.suctionList)
+  console.log('戈纳提中', this.dry_weight)
   this.catheter_evaluation_program_list = getDataConfig('hemodialysis','catheter_evaluation_program')
   this.skin_site_catheterization_list = getDataConfig('hemodialysis','skin_site_catheterization')
   this.teach = getDataConfig('befor_symptoms', 'befor_symptoms')
@@ -692,9 +693,11 @@ created () {
         )
       }
     }
+    console.log("dryWeight",this.dry_weight)
     if (this.dry_weight != undefined) {
       this.formValue.dry_weight = this.dry_weight.dry_weight
       this.propDryForm.weight = this.dry_weight.dry_weight.toString()
+      this.propDryForm.remark = this.dry_weight.remakes
     }
   }
 
@@ -717,14 +720,17 @@ created () {
       this.$set(this.formValue, 'dry_weight', this.dry_weight.dry_weight.toString())
     }
     this.propDryForm.weight = this.dry_weight.dry_weight.toString()
+    this.propDryForm.remark = this.dry_weight.remakes
   } else {
     if (this.predialysis.id == undefined && this.last_predialysis.id != undefined) {
+      console.log('几拿了23232332')
       this.$set(
         this.formValue,
         'dry_weight',
         this.last_predialysis['dry_weight'].toString()
       )
       this.propDryForm.weight = this.formValue.dry_weight
+     
     }
   }
   this.hemorrhage_state = this.formValue.is_hemorrhage == 0
@@ -747,12 +753,12 @@ created () {
     this.formValue.blood_access_part_id = this.lastAssessment.blood_access_part_id
 
   }
-
+  console.log('998823323232323232', this.predialysis.id)
   if(this.predialysis!=null && this.predialysis.id ==undefined && this.last_predialysis.id > 0){
-
+    console.log("上次我哦我我", this.last_predialysis.venous_catheterization)
     this.formValue.venous_catheterization = this.last_predialysis.venous_catheterization
   }
-  // console.log('last_predialysis2332323232', this.last_predialysis)
+  console.log('last_predialysis2332323232', this.last_predialysis)
   if (this.predialysis.id == 0 && this.last_predialysis.id != 0) {
     let vascular_access_desc = getDataConfig(
       'hemodialysis',
@@ -800,6 +806,7 @@ methods: {
     }
   },
   newClick (event) {
+    console.log(event)
     // event.currentTarget.select()
   },
   isShow (name) {
@@ -833,6 +840,7 @@ methods: {
   },
   commitInfo: function () {
   if(this.isWrite('透前称重') ==true   && (this.formValue.weight_before =='' || this.formValue.weight_before ==undefined ||  this.formValue.weight_before == '0')){
+      console.log('12345678899',this.formValue.weight_before);
       Toast.fail(`透前称重为必填字段，不能为空`)
     }else if (this.isCommit == true) {
      // this.isCommit = false
@@ -885,7 +893,7 @@ methods: {
      if(this.formValue.breathing_rate!=undefined){
         this.formValue.breathing_rate = this.formValue.breathing_rate.toString()
      }
-  
+     console.log('hhhahhah', this.formValue)
      if (this.formValue.thromubus_type === 2) {
        this.formValue.thromubus_a = ''
        this.formValue.thromubus_v = ''
@@ -898,6 +906,7 @@ methods: {
      // 必填弹窗开始
        let ParamsQuery = this.formValue;
 
+       console.log(ParamsQuery, "提交的参数");
 
        if(ParamsQuery.is_hemorrhage!=1){
          delete ParamsQuery.hemorrhage
@@ -923,6 +932,8 @@ methods: {
             result.unshift(el)
           }
        });
+       console.log(result, "提交的参数当中过滤出为空的");
+       console.log(this.getArrEqual(filedList, result));
        let warnarr = [];
        warnarr = this.getArrEqual(filedList, result);
 
@@ -974,12 +985,13 @@ methods: {
   },
 
   getArrEqual(arr1, arr2) {
-
+    // console.log(arr1, arr2, "arr1, arr2");
     let newArr = [];
     for (let i = 0; i < arr2.length; i++) {
       for (let j = 0; j < arr1.length; j++) {
         if (arr1[j].module == 3 && arr1[j].is_show == 1 &&arr1[j].filed_name == arr2[i][0]&&arr1[j].is_write == 1) {
-
+          // console.log(arr1[j],'数据字段')
+          // console.log(arr2[i][0], "这是啥呀");
           newArr.push(arr1[j]);
         }
         if(arr1[j].module == 3 &&
@@ -988,7 +1000,7 @@ methods: {
           arr1[j].filed_name == arr2[i][0] &&
           arr1[j].filed_name == 'hemorrhage_other' && this.formValue.is_hemorrhage == 1)
           {
-      
+            console.log('1234567889999',this.formValue.hemorrhage_other);
             newArr.push(arr1[j]);
         }
         if(arr1[j].module == 3 &&
@@ -997,16 +1009,18 @@ methods: {
           arr1[j].filed_name == arr2[i][0] &&
           arr1[j].filed_name == 'hemorrhage' && this.formValue.is_hemorrhage == 1)
           {
+            console.log('qwertyuiop',this.formValue.hemorrhage_other);
             newArr.push(arr1[j]);
         }
       }
 
     }
-
+    console.log(newArr,'newArr')
     return newArr;
   },
 
   open_tips(info) {
+    console.log(info, "oo");
     for (let i = 0; i < info.length; i++) {
       if (info[i].is_write == 1) {
         Toast.fail(`${info[i].filed_name_cn}为必填字段，不能为空`)
@@ -1775,6 +1789,7 @@ methods: {
         ) {
           if (this.formValue.pinholing.length > 0) {
             this.propForm.result = this.formValue.pinholing.split(',')
+            // console.log("箴言------",this.propForm.result)
           } else {
             this.propForm.result = []
           }

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

@@ -117,7 +117,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月)
@@ -151,6 +151,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位)
@@ -168,6 +185,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

@@ -140,6 +140,8 @@
                 </div>
             </van-popup>
         </div>
+
+
        <van-popup
         v-model="infor_visibility"
         class="advicePopup"
@@ -274,7 +276,8 @@ export default {
     }
   },
   mounted () {
-
+    console.log('drug_spec_unit_options', this.execution_frequency_options)
+    // console.log('中国实际233322332323232', this.schedulePatient)
     var patient_id = this.$route.query.patient_id
     this.patient_id = patient_id
     this.record_date_str = parseTime(new Date(), '{y}-{m}-{d}')
@@ -285,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月)
@@ -317,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位)
@@ -333,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'
     }
@@ -368,24 +389,48 @@ export default {
       this.start_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}') + ':00'
     },
     querySearch (queryString, cb) {
+      console.log('hhhhhhhh232323', this.all_drug)
+      console.log('queryString', queryString)
       var restaurants = this.all_drug
       restaurants.map(item => {
         item.value = item.drug_name
       })
       var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
       // 调用 callback 返回建议列表的数据
+      console.log('results', results)
       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('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) {
@@ -404,11 +449,13 @@ export default {
     },
     querySearch1 (queryString, cb) {
       var restaurants = this.drugSpec
+      console.log(restaurants)
       restaurants.map(item => {
         item.value = item.drug_spec
       })
       var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
       // 调用 callback 返回建议列表的数据
+      console.log('results', results)
       cb(results)
     },
     createFilter1 (queryString) {
@@ -417,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
@@ -458,10 +506,13 @@ export default {
       this.drug_spec_unit_show = true
     },
     comfirmAction: function () {
+      console.log('2323232', this.drug_id)
+      console.log('3544555', this.way)
       if (this.way == 1) {
         this.drug_name_id = this.drug_id
       }
       if (this.way == 2) { // 自备药
+        // console.log('1111222222')
         var arr = this.order.title.split('(自备药)')
         this.order.title = arr[0]
       }
@@ -472,7 +523,8 @@ export default {
             arr = this.all_drug[i].drug_specs
           }
         }
-
+        console.log('arr', arr)
+        console.log('orrrrr', this.order.advice_desc)
         if (arr.length > 0) {
           for (let i = 0; i < arr.length; i++) {
             if (arr[i].drug_spec == this.order.advice_desc) {
@@ -500,6 +552,7 @@ export default {
         id: 0,
         subdrugs: []
       })
+      console.log('advice:', this.advices)
 
       var data = {}
       data.advice_type = 2
@@ -544,10 +597,12 @@ export default {
       }
 
       data.adviceNames = adviceJSONs
+      console.log('232323232woowowwo', adviceJSONs)
 
       this.loading = true
       let mode = '1'
       var is_child = 1
+      console.log('data233223232332我', data)
 
       batchCreateAdvices(this.patient_id, this.group_no, data, mode, is_child)
         .then(rs => {

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
@@ -96,6 +100,10 @@ export default {
           let data = {
             goods: this.list
           }
+          console.log('data------------------', data)
+
+          console.log("data------------------",data)
+
           // 处方修改数量触发接口
           PostOtherGoodStockOut(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), data).then(rs => {
             var res = rs.data
@@ -120,6 +128,7 @@ export default {
           }
           )
         } else {
+          console.log('进来22222222222222222222222')
           PostGoodStockOut(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}')).then(rs => {
             var res = rs.data
             if (res.state == 1) {
@@ -192,6 +201,7 @@ export default {
               this.isEditBefore = 2
             }
           }
+          //good_user auto    last_good_user (上次透析)  good_user_detail（准备表） last_good_user_detail（上次透析）
           for (let i = 0; i < res.data.dialysis_goods.length; i++) {
             if (res.data.dialysis_goods[i].good_user.length > 0) {
               for (let b = 0; b < res.data.dialysis_goods[i].good_user.length; b++) {
@@ -232,6 +242,7 @@ export default {
                   for (let b = 0; b < res.data.dialysis_goods[i].project.length; b++) {
                     if (res.data.dialysis_goods[i].project[b].good_info.type.out_stock == 1) {
                       if (res.data.dialysis_goods[i].project[b].good_info.id > 0) {
+                        console.log("金我我我我嚄1111")
                         var newArr = []
                         let obj = {
                           good_type_id: res.data.dialysis_goods[i].project[b].good_info.good_type_id,
@@ -245,6 +256,7 @@ export default {
                           good_type_id:res.data.dialysis_goods[i].project[b].good_info.good_type_id,
                         }
                         this.list.push(obj)
+                        console.log('list', this.list)
                       }
                     }
                   }
@@ -278,7 +290,7 @@ export default {
           }
 
           var arr = this.list
-
+          console.log("arrwowoowowowowow",arr)
           if (arr.length > 0) {
             for (let i = 0; i < arr.length; i++) {
               arr[i].child = []
@@ -293,6 +305,7 @@ export default {
 
           // 已经出库数据
           var warehouseOutList = res.data.warehouseOutList
+          console.log('warehouseOutList', warehouseOutList)
 
           for (let i = 0; i < arr.length; i++) {
             if (arr[i].child != undefined && arr[i].child.length > 0) {
@@ -338,7 +351,7 @@ export default {
           var dialyszerArr = []
           var irrigationArr = []
           var dialysisStrainerArr = []
-          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10402 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10489) {
+          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10402 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10489 && this.$store.getters.user.template_info.org_id != 10215 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10278 && this.$store.getters.user.template_info.org_id != 10480) {
             if (prescription != null && res.data.dialysis_goods[0].good_user_detail.length == 0) {
               var dialysisDialyszers = prescription.dialysis_dialyszers
               var arr = dialysisDialyszers.split(',')
@@ -474,7 +487,7 @@ export default {
 
                // 已经出库数据
           var warehouseOutList = res.data.warehouseOutList
-
+          console.log('warehouseOutList', warehouseOutList)
 
           for (let i = 0; i < arr.length; i++) {
             if (arr[i].child != undefined && arr[i].child.length > 0) {
@@ -513,6 +526,7 @@ export default {
             }
           }
 
+        
           // 判断是否出库
           if(newArr!=null && newArr.length >0){
              var total_one = 0
@@ -532,13 +546,16 @@ export default {
 
           this.list = newArr
 
+          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 = []
           }
         }
       }
@@ -554,7 +571,8 @@ export default {
     },
 
     updateAutoReduceDetail (count, good_id) {
-  
+      console.log("arrrrr------",count,good_id)
+      console.log("record_adate",this.list)
      if(this.list!=null && this.list.length >0){
         for(let i=0;i<this.list.length;i++){
           if(good_id == this.list[i].good_id){
@@ -562,7 +580,9 @@ export default {
           }
         }
      }
-
+     console.log("this-------",this.list)
+     console.log("goods------------",this.new_dialysis_goods)
+     console.log(" this.schedule_date",this.schedule_date)
      var record_time = ""
      if(this.new_dialysis_goods!=null && this.new_dialysis_goods.length >0){
         if(this.new_dialysis_goods[0].last_good_user!=null){
@@ -600,7 +620,42 @@ export default {
         record_time: record_time,
         patient_id: this.patient_id ? this.patient_id : this.$route.query.patient_id
       }
-
+      console.log('Data0-----', data)
+      // if (count == 0) {
+      //   Dialog.confirm({
+      //     title: '删除',
+      //     message: '是否删除该条耗材'
+      //   }).then(() => {
+      //     deteleAutoReduceDetail(data).then((res) => {
+      //       if (res.data.state == 1) {
+      //         this.list.map((item, index) => {
+      //           if (item.good_id == good_id) {
+      //             this.list.splice(index, 1)
+      //           }
+      //         })
+      //         Toast.success('删除成功')
+      //       }
+      //     })
+      //   }).catch(() => {
+      // if (count == 0) {
+      //   Dialog.confirm({
+      //     title: '删除',
+      //     message: '是否删除该条耗材'
+      //   }).then(() => {
+      //     deteleAutoReduceDetail(data).then((res) => {
+      //       if (res.data.state == 1) {
+      //         this.list.map((item, index) => {
+      //           if (item.good_id == good_id) {
+      //             this.list.splice(index, 1)
+      //           }
+      //         })
+      //         Toast.success('删除成功')
+      //       }
+      //     })
+      //   }).catch(() => {
+
+      //   })
+      // }
 
         updateStockGoods(data).then(response => {
             if (response.data.state == 1) {
@@ -609,6 +664,14 @@ export default {
             }
           })
 
+        // updateStockGoods(data).then((res) => {
+        //   updateStockGoods(data).then(response => {
+        //     if (response.data.state == 1) {
+        //       var msg = response.data.data.msg
+        //       // Toast.success('更新成功')
+        //     }
+        //   })
+        // })
         updateStockGoods(data).then(response => {
           if (response.data.state == 1) {
             var msg = response.data.data.msg

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -86,15 +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="$store.getters.user.template_info.org_id == 10551 &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined && dialysisPrescription.target_ultrafiltration>0">超滤量占体重百分比:{{ ((predialysis.weight_before/(dialysisPrescription.target_ultrafiltration*1000))*100).toFixed(2)  }}%</span>
+            }}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"
@@ -140,7 +144,7 @@
                 $store.getters.user.template_info.org_id!=9829 &&
                 $store.getters.user.template_info.org_id!=10440 &&
                 $store.getters.user.template_info.org_id!=10469 &&
-                $store.getters.user.template_info.org_id!=10460 
+                $store.getters.user.template_info.org_id!=10460
               "
               >目标超滤量(L)</span
             >
@@ -187,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="是否单超脱水"
@@ -381,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>
@@ -409,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>
@@ -441,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
@@ -467,10 +478,14 @@
                   $store.getters.user.template_info.org_id != 10234 &&
                   $store.getters.user.template_info.org_id != 10340 &&
                   $store.getters.user.template_info.org_id != 10432 &&
-                  $store.getters.user.template_info.org_id != 10495 && 
+                  $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
                   )
               "
             >
@@ -501,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
@@ -523,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">
@@ -533,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
               >
@@ -589,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
@@ -647,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>
@@ -673,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>
@@ -1044,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>
@@ -1292,7 +1330,7 @@
          <van-field v-model="dialysisPrescription.sodium_bicarbonate_flow" @focus="inputFocus" v-if="isShow('碳酸氢钠流速')" label="碳酸氢钠流速(ml/h)" input-align="right"/>
 
          <van-field v-model="dialysisPrescription.washing_time" @focus="inputFocus" v-if="isShow('冲洗时间') && dialysisPrescription.anticoagulant == 1" label="q(h)" input-align="right"/>
-         
+
          <van-field v-model="dialysisPrescription.warsh_count" @focus="inputFocus" v-if="isShow('冲洗量') && dialysisPrescription.anticoagulant == 1" label="NS冲洗量(ml)" input-align="right"/>
 
 
@@ -1458,6 +1496,9 @@ export default {
     last_prescription: {
       type: Object,
     },
+    lastDialysisPrescription:{
+      type:Object,
+    },
     prescription_prop: {
       type: Object,
     },
@@ -1626,6 +1667,7 @@ export default {
         chaptalization:"",
         washing_time:"",
         warsh_count:"",
+        blood_access_part_id:"",
       },
       anticoagulant: {
         id: 0,
@@ -1702,6 +1744,7 @@ export default {
     },
   },
   created() {
+    console.log("wo'wo'o'o'o'o'o'o'o'o'o'o'o'o'o'o'o'o'o",this.lastDialysisPrescription)
     this.teachList = getDataConfig('dialysis_remark', 'dialysis_remark')
     if (this.prescription_prop != undefined) {
       if (this.prescription_prop.anticoagulant == 1) {
@@ -1933,13 +1976,15 @@ export default {
     this.dialysisPrescription.sodium = this.getFloat(
       this.dialysisPrescription.sodium
     );
-    // console.log("机哪里了232332", this.prescription_prop);
+    console.log("机哪里了232332", this.prescription_prop);
     if (this.prescription_prop != undefined && this.prescription_prop.id == 0) {
+      console.log("jinlai22222");
       if (this.$store.getters.user.template_info.org_id == 9671 ||this.$store.getters.user.template_info.org_id == 9675 ||this.$store.getters.user.template_info.org_id == 10340) {
         this.dialysisPrescription.sodium = 138;
         this.dialysisPrescription.bicarbonate = 31.1;
         this.dialysisPrescription.dialysate_flow = 500;
-        
+
+        console.log("hhh23h32h23h", this.last_prescription);
         if (this.last_prescription != null) {
           this.dialysisPrescription.remark = this.last_prescription.remark;
           this.dialysisPrescription.chaptalization = this.last_prescription.chaptalization
@@ -1951,12 +1996,28 @@ export default {
           if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
             this.dialysisPrescription.target_ultrafiltration = this.predialysis.weight_before - this.predialysis.dry_weight
           }
-        
+
+        }
+
+      }
+
+      //针对北方营口
+      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){
+           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(
       this.dialysisPrescription.calcium
     );
@@ -1998,7 +2059,7 @@ export default {
         this.dialysisPrescription.is_water = "请选择";
       }
     }
-    
+
   },
   methods: {
     radioChange(val) {},
@@ -3541,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('请填写抗凝剂!')
@@ -3552,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;
           }
@@ -3566,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;
@@ -3581,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 {
@@ -3601,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;
@@ -3765,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 {
@@ -3793,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 {
@@ -3812,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;
@@ -3935,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 {
@@ -3954,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;
@@ -4087,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 {
@@ -4106,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;
@@ -4305,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 {
@@ -4325,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;
@@ -4458,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 {
@@ -4477,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;
@@ -4687,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 {
@@ -4706,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;
@@ -4838,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 {
@@ -4857,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;
@@ -5058,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 {
@@ -5077,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;
@@ -5228,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;
@@ -5362,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
@@ -5386,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;
@@ -5401,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 {
@@ -5420,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;
@@ -5608,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 {
@@ -5627,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;
@@ -5747,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 {
@@ -5772,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;
@@ -5905,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 {
@@ -5924,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;
@@ -6114,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 {
@@ -6134,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;
@@ -6286,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;
@@ -6494,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;
@@ -6637,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;
@@ -6789,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;
@@ -7006,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;
@@ -7157,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;
@@ -9168,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]);
@@ -9178,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]);
@@ -9188,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;
@@ -9198,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]);
@@ -9757,24 +9848,13 @@ export default {
                     response.data.data.solution[key];
                 }
               }
-              if (
-                this.$store.getters.user.template_info.org_id == 9671 ||
-                this.$store.getters.user.template_info.org_id == 9675 ||
-                this.$store.getters.user.template_info.org_id == 10340
-              ) {
-                console.log(
-                  "抠门；哦啊",
-                  response.data.data.dialysisPrescription.remark
-                );
+              if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 ||this.$store.getters.user.template_info.org_id == 10340) {
+                console.log("抠门；哦啊",response.data.data.dialysisPrescription.remark);
                 this.dialysisPrescription.sodium = 138;
                 this.dialysisPrescription.bicarbonate = 31.1;
                 this.dialysisPrescription.dialysate_flow = 500;
-                if (
-                  this.last_prescription != null &&
-                  response.data.data.dialysisPrescription != null
-                ) {
-                  this.dialysisPrescription.remark =
-                    response.data.data.dialysisPrescription.remark;
+                if (this.last_prescription != null && response.data.data.dialysisPrescription != null) {
+                  this.dialysisPrescription.remark =  response.data.data.dialysisPrescription.remark;
                 }
               }
               if(this.$store.getters.user.template_info.org_id == 10447){
@@ -9788,6 +9868,13 @@ export default {
                     this.dialysisPrescription.displace_liqui_value = 32
                 }
               }
+              console.log("机构id我噢哦嚄嚄我",this.$store.getters.user.template_info.org_id)
+              if(this.$store.getters.user.template_info.org_id == 10445){
+                console.log("上次透析处方",this.lastDialysisPrescription)
+                if (this.lastDialysisPrescription != null) {
+                  this.dialysisPrescription.remark = this.lastDialysisPrescription.remark
+                }
+              }
             } else {
               if (response.data.data.prescription != null) {
                 // 临时处方不为空
@@ -9899,6 +9986,13 @@ export default {
                     this.last_prescription.remark;
                 }
               }
+
+              if(this.$store.getters.user.template_info.org_id == 10445){
+                console.log("上次透析处方2",this.lastDialysisPrescription)
+                if (this.lastDialysisPrescription != null) {
+                  this.dialysisPrescription.remark = this.lastDialysisPrescription.remark;
+                }
+              }
             }
           }
 
@@ -9987,6 +10081,8 @@ export default {
         this.dialysisPrescription.anticoagulant_shouji = "";
         this.dialysisPrescription.anticoagulant_zongliang = "";
         this.dialysisPrescription.anticoagulant_weichi = "";
+        this.dialysisPrescription.washing_time=1
+        this.dialysisPrescription.warsh_count =150
       }
       let anticoagulan_name = "";
       let anticoagulant = this.anticoagulantsConfitTwo;
@@ -9995,6 +10091,7 @@ export default {
           anticoagulan_name = anticoagulant[keys].name;
         }
       }
+
       return anticoagulan_name;
     },
     getBodyFluid: function (val) {
@@ -10170,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;
@@ -10381,7 +10510,7 @@ export default {
           this.propForm.result = newArr;
           this.propForm.click_ref = "dialysis_irrigation";
           break;
-        
+
         case "plasma_separator":
           this.propForm.type = 16;
           this.isShowDialog = false;
@@ -10568,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() {
@@ -10720,6 +10852,7 @@ export default {
   },
   watch: {
     "dialysisPrescription.blood_flow_volume": function () {
+      console.log("处方233322323");
       this.dialysisPrescription.replacement_flow = replacementFlow(
         this.dialysisPrescription.blood_flow_volume
       );

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"/>
@@ -355,10 +361,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>
@@ -372,7 +378,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>
@@ -417,7 +423,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/TodayTab.vue

@@ -103,6 +103,7 @@
                            :stockType="stockType"
                            :admin_map="admin_user_map"
                            :admins="admin_users"
+                           :lastDialysisPrescription="lastDialysisPrescription"
                            ></dialysisPrescription>
 
         <accepts v-if="barActive == 2" ref="accepts" :accepts="receiver_treatment_access" :patient_prop="patient"></accepts>
@@ -374,6 +375,7 @@ export default {
       his_is_open: 0,
       his_project_is_open: 0,
       last_prescription: {},
+      lastDialysisPrescription:{},
       system_prescription: {}, // 系统透析模版
       thoroug_dialog_reset: true,
       prescription_dialog_reset: true,
@@ -1170,7 +1172,9 @@ export default {
           this.prescription_open = resp.data.prescription_open
 
           var last_prescription = resp.data.last_prescription
-
+         //不按透析模式
+         this.lastDialysisPrescription =  resp.data.lastDialysisPrescription
+         console.log("不按透析模式wowowowo",this.lastDialysisPrescription)
           var system_prescription = resp.data.system_prescription
 
           this.dryWeight = resp.data.dry_weight

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"
@@ -514,7 +528,9 @@ export default {
         out_reason: '',
         relative_phone: '',
         remark: '',
-        treatment_plan: ''
+        treatment_plan: '',
+        home_address:"",
+        home_telephone:"",
       },
       bloodShow: true,
       slowShow: false,
@@ -784,6 +800,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))
@@ -1190,6 +1212,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,