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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13699"
+  "version": "2999.999.13722"
 }

src/api/manage.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { Console } from 'console'
 
 export function getEquitAutoInfo (params) {
   return request({
@@ -24,6 +25,15 @@ export function SaveDisinfetionInfo (params) {
   })
 }
 
+export function SaveDisinfetionInfoOne(params){
+  console.log("中国=====================",params)
+  return request({
+    url:"/m/api/savedisinfectioninfoone",
+    method:"get",
+    params:params,
+  })
+}
+
 export function getDeviceInformation(params){
   return request({
     url:"/m/api/getdeviceinformation",

src/api/newlogin.js

@@ -0,0 +1,10 @@
+import request from '@/utils/login'
+
+export function checkMobileIp(params) {
+  return request({
+    url: '/test',
+    method: 'get',
+    params: params
+  })
+}
+

src/pages/doctorAdvice/components/new_Inspectiondetails.vue

@@ -40,11 +40,32 @@
         <el-table-column
           v-for="(item,index) in columns" :key="index"
           :prop="item.prop"
-          :label="item.label"
+          :label="item.item_name"
           width="150">
-         <!-- <template slot-scope="scope" >
-          {{ scope.row.prop }}
-         </template> -->
+         <template slot-scope="scope" >
+           
+          <span v-if="item.range_type == 3">
+            {{ getItemValueOne(scope.row.inspect_date,item.item_name) }} 
+          </span>
+
+          <span v-if="item.range_type == 2">
+            <span v-if="getItemValue(scope.row.inspect_date,item.item_name)=='阳性'" style="color: red"> {{ getItemValue(scope.row.inspect_date,item.item_name) }}</span>
+            <span v-if="getItemValue(scope.row.inspect_date,item.item_name)=='阴性'"> {{ getItemValue(scope.row.inspect_date,item.item_name) }}</span>
+          </span>
+
+          <span v-if="item.range_type == 1">
+             <span v-if="parseFloat(getItemValue(scope.row.inspect_date,item.item_name)) < parseFloat(item.range_min) ">
+              {{ getItemValue(scope.row.inspect_date,item.item_name) }} <span style="color: blue;" v-if="getItemValue(scope.row.inspect_date,item.item_name)>0">↓</span>
+             </span>
+             <span v-if="parseFloat(item.range_min)<= parseFloat( getItemValue(scope.row.inspect_date,item.item_name)) && parseFloat(getItemValue(scope.row.inspect_date,item.item_name))  <= parseFloat(item.range_max) ">
+               {{ getItemValue(scope.row.inspect_date,item.item_name) }} 
+             </span>
+             <span v-if="parseFloat(getItemValue(scope.row.inspect_date,item.item_name)) >parseFloat(item.range_max) ">
+              {{ getItemValue(scope.row.inspect_date,item.item_name) }} <span style="color: red;" v-if="getItemValue(scope.row.inspect_date,item.item_name)>0">↑</span>
+             </span>
+          </span>
+         
+         </template>
         </el-table-column>
         <!-- <el-table-column v-for="(item,index) in columns" :key="index"
           :prop="item.prop"
@@ -186,51 +207,57 @@ export default {
 
         const list = response.data.data.inspection
         const tablehed = response.data.data.referenceList
-        console.log('response11111',list);
+        console.log('response11111',tablehed);
 
-        // this.tableData = list
+        this.tableData = list
         var columns = []
-        const date = []
-        var date1 =[]
-        let table = [{inspect_date:''}]
-        const datable =[]
+        // const date = []
+        // var date1 =[]
+        // let table = [{inspect_date:''}]
+        // const datable =[]
         // const arr ={}
-        if(tablehed.length >0){
-          for(let i=0;i<tablehed.length;i++){
-            const obj ={
-              label:tablehed[i].item_name,
-              // prop:child[i].item_name
-              prop:'value'+(i+1)
-            }
-            columns.push(obj)
-          }
-        }
+        // if(tablehed.length >0){
+        //   for(let i=0;i<tablehed.length;i++){
+        //     const obj ={
+        //       label:tablehed[i].item_name,
+        //       prop:'value'+(i+1)
+        //     }
+        //     columns.push(obj)
+        //   }
+        // }
+
+        this.columns = tablehed
 
         // console.log('list[0].Child121',columns);
 
-        list.forEach(item =>{
-          const datable1 ={
-            inspect_date:item.inspect_date,
-          }
-          datable.push(datable1)
+        // list.forEach(item =>{
+        //   const datable1 ={
+        //     inspect_date:item.inspect_date,
+        //   }
+        //   datable.push(datable1)
 
-          item.Child.forEach((item1,index1) =>{
-            for(let i in datable){
-              for(let j in columns){
-                if(item1.inspect_date == datable[i].inspect_date && columns[j].label == item1.item_name){
-                    datable[i][columns[j].prop] = item1.inspect_value
-                }
-              }
-            }
-          })
-        })
-        table =datable
-        this.datable = datable
+        //   item.Child.forEach((item1,index1) =>{
+        //     for(let i in datable){
+        //       for(let j in columns){
+        //         if(item1.inspect_date == datable[i].inspect_date && columns[j].label == item1.item_name){
+        //             console.log("item1---------------",item1)
+        //             if(item1.inspect_type == 2){
+        //               datable[i][columns[j].prop] = item1.inspect_value 
+        //             }
+        //             datable[i][columns[j].prop] = item1.inspect_value
+        //         }
+        //       }
+        //     }
+        //   })
+        // })
+        // table =datable
+        // this.datable = datable
         // console.log('ppppp',columns);
 
-        this.tableData = table
-        this.columns = columns
-        console.log('11111',this.tableData);
+        // this.tableData = table
+        // console.log("columns",columns)
+        // this.columns = columns
+        // console.log('11111',this.tableData);
       })
 
     },
@@ -241,6 +268,31 @@ export default {
         }
       }
     },
+    getItemValue(inspect_date,item_name){
+   
+      var inspect_value = ""
+      for(let i=0;i<this.tableData.length;i++){
+        for(let j=0;j<this.tableData[i].Child.length;j++){
+          if(inspect_date == this.tableData[i].Child[j].inspect_date && item_name == this.tableData[i].Child[j].item_name){
+            inspect_value = this.tableData[i].Child[j].inspect_value
+          }
+        }
+        
+      }
+      return inspect_value
+    },
+    getItemValueOne(inspect_date,item_name){
+      var inspect_value = ""
+      for(let i=0;i<this.tableData.length;i++){
+        for(let j=0;j<this.tableData[i].Child.length;j++){
+          if(inspect_date == this.tableData[i].Child[j].inspect_date && item_name == this.tableData[i].Child[j].item_name){
+            inspect_value = this.tableData[i].Child[j].inspect_value
+          }
+        }
+        
+      }
+      return inspect_value
+    },
     changeoption(val){
       // console.log('val',val);
       const option = this.options

src/pages/home/login.vue

@@ -77,6 +77,15 @@ import { setRem } from "@/libs/functionRem";
 import { Dialog } from "vant";
 import Popup from "./Popup/index"
 import axios from 'axios'
+const https = require('https');
+const agent = new https.Agent({  
+  rejectUnauthorized: false  // 忽略证书验证
+});
+const instance = axios.create({
+  httpsAgent: agent,
+  baseURL: 'http://192.168.0.38:8080', // API 的基础 URL
+  timeout: 30000 // 请求超时时间
+});
 export default {
   name: "Home",
   components:{
@@ -254,30 +263,29 @@ export default {
           }
         })
     },
-    checkMobileIp(){
-      checkMobileIp().then(response=>{
-        if(response.data.state == 1){
-          
-        }
-      })
+   checkMobileIp() {
+      console.log("000000000000000000000000000000000000");
+
+      var that = this;
+
+      instance.get('/test').then(function(response) {
+          console.log("response", response);
+          console.log("response.data.data.flag", response.data.data.flag);
+
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg);
+            return false;
+          }
+
+          if (response.data.state == 1) {
+            console.log("hahahahh");
+            that.$router.replace({ path: "/" });
+           
+          }
+        }).catch(function(error) {
+          console.error("Error:", error);
+        });
     },
-    // checkMobileIp(){
-    //   console.log("000000000000000000000000000000000000")
-    //   var that = this
-    //   axios.get('https://192.168.2.80:8080/test').then(function(response) {
-    //       console.log("response",response)
-    //       console.log("response.data.data.flag",response.data.data.flag)
-    //       if (response.data.state == 0) {
-    //         that.$message.error(response.data.data.msg);
-    //         return false
-    //       } 
-    //       if(response.data.state == 1) {
-    //         console.log("hahahahh")
-    //         that.$router.replace({ path: "/" });
-    //       }
-    //     }).catch(function(error) {
-    //   })
-    // },
     showForgetPwdDialog() {
       Dialog.confirm({
         title: "账号或密码不正确",

src/pages/main/DialysisArea.vue

@@ -402,18 +402,19 @@ export default {
       }
       this.zoneMapObj = zoneMap
       console.log('zoneMap----------------', zoneMap)
+
       var zones = []
-      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
+      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区',sort:0 })
 
       for (var zoneName in zoneMap) {
-        zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName })
+        zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName,sort:zoneMap[zoneName].sort })
       }
 
       zones = zones.sort(function (a, b) {
-        return a.value > b.value
-      })
+          return a.sort - b.sort
+       })
       // this.zones = zones
-      // console.log('zones323232332', zones)
+      console.log('zones323232332', zones)
       this.zonesList = zones
 
       var dialysis_scheduals = []
@@ -440,16 +441,26 @@ export default {
               zones[i].text = '全部分区'
               zones[i].zone_name = '全部分区'
               zones[i].text = zones[i].text + '(' + total + ')'
+              zones[i].sort = 0
             }
             if (zones[i].text == dialysis_scheduals[j].zone_name) {
               zones[i].zone_name = zones[i].text
               zones[i].text = zones[i].text + '(' + dialysis_scheduals[j].scheduals.length + ')'
+              zones[i].sort = zones[i].sort
             }
           }
         }
 
+        
+        zones = zones.sort(function (a, b) {
+          return a.sort - b.sort
+        })
+
+        console.log("总过=================================",zones)
         this.zones = []
         this.zones = zones
+
+        
       }
 
       this.dialysis_scheduals = dialysis_scheduals
@@ -723,20 +734,22 @@ export default {
               }
               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
+                zoneMap[schedual.device_number.zone.name] = schedual.device_number.zone
               }
             }
             this.zoneMapObj = zoneMap
             var zones = []
-            zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
-
+            zones.push({ value: 0, text: '全部分区', zone_name: '全部分区',sort:0 })
+              
+            console.log("zoneMap-================================",zoneMap)
             for (var zoneName in zoneMap) {
-              zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName })
+              console.log("zoneNmae-----------------",zoneName)
+              zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName,sort:zoneMap[zoneName].sort })
             }
-
+            
+            
             zones = zones.sort(function (a, b) {
-              return a.value > b.value
+                return a.sort - b.sort
             })
             // this.zones = zones
             this.zoneAllList = zones
@@ -752,7 +765,8 @@ export default {
               }
               dialysis_scheduals.push({
                 zone_name: zone.text,
-                scheduals: scheduals
+                scheduals: scheduals,
+                sort:zone.sort,
               })
             }
 
@@ -768,15 +782,22 @@ export default {
                     zones[i].text = '全部分区'
                     zones[i].zone_name = '全部分区'
                     zones[i].text = zones[i].text + '(' + (total).toString() + ')'
+                    zones[i].sort = 0
                   }
                   if (zones[i].text == dialysis_scheduals[j].zone_name) {
                     zones[i].zone_name = zones[i].text
                     zones[i].text = zones[i].text + '(' + (dialysis_scheduals[j].scheduals.length).toString() + ')'
+                    zones[i].sort = zones[i].sort
                   }
                 }
               }
               this.zones = []
 
+              zones = zones.sort(function (a, b) {
+                 return a.sort - b.sort
+               })
+              console.log("zones=======================",zones )
+
               this.zones = zones
             }
 
@@ -886,15 +907,15 @@ export default {
             }
 
             var zones = []
-            zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
+            zones.push({ value: 0, text: '全部分区', zone_name: '全部分区',sort:0 })
 
             for (var zoneName in zoneMap) {
-              zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName })
+              zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName,sort:zoneMap[zoneName].sort })
             }
 
             zones = zones.sort(function (a, b) {
-              return a.value > b.value
-            })
+               return a.sort - b.sort
+             })
             this.zonesList = []
             this.zonesList = zones
             var dialysis_scheduals = []
@@ -1337,14 +1358,14 @@ export default {
       }
       console.log('zoneMapObj', this.zoneMapObj)
       var zones = []
-      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
+      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区',sort:0 })
 
       for (var zoneName in this.zoneMapObj) {
-        zones.push({ value: this.zoneMapObj[zoneName].id, text: zoneName, zone_name: zoneName })
+        zones.push({ value: this.zoneMapObj[zoneName].id, text: zoneName, zone_name: zoneName,sort: this.zoneMapObj[zoneName].sort })
       }
 
       zones = zones.sort(function (a, b) {
-        return a.value > b.value
+          return a.sort - b.sort
       })
 
       if (index > 0) {
@@ -1364,9 +1385,11 @@ export default {
               zones[i].text = '全部分区'
               zones[i].zone_name = '全部分区'
               zones[i].text = zones[i].text + '(' + total + ')'
+              zones[i].sort=0
             }
             if (zones[i].text == this.dialysis_scheduals[j].zone_name) {
               zones[i].text = zones[i].text + '(' + this.dialysis_scheduals[j].bedList.length + ')'
+              zones[i].sort = zones[i].sort
             }
           }
         }
@@ -1390,9 +1413,11 @@ export default {
               zones[i].text = '全部分区'
               zones[i].zone_name = '全部分区'
               zones[i].text = zones[i].text + '(' + total + ')'
+              zones[i].sort=0
             }
             if (zones[i].text == this.dialysis_scheduals[j].zone_name) {
               zones[i].text = zones[i].text + '(' + this.dialysis_scheduals[j].bedList.length + ')'
+              zones[i].sort = zones[i].sort
             }
           }
         }

src/pages/main/PatientBox.vue

@@ -675,8 +675,23 @@
                 <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 16">iu</span>
                 <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 16">iu</span>
 
-                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 17">mg</span>
-                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 17">mg</span>
+                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 17">
+                 <span v-if="$store.getters.user.template_info.org_id !=10644"> mg</span>
+                 <span v-if="$store.getters.user.template_info.org_id ==10644"> U</span>
+                </span>
+                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 17">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644"> U</span>
+                </span>
+
+                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 14">
+                 <span v-if="$store.getters.user.template_info.org_id !=10644"> mg</span>
+                 <span v-if="$store.getters.user.template_info.org_id ==10644"> iu</span>
+                </span>
+                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 14">
+                  mg
+                </span>
+
 
                 维持: {{patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant_weichi?patient.prescription&&patient.prescription.anticoagulant_weichi:"" }}
                 {{patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant_weichi?patient.dialysis_solution&&patient.dialysis_solution.anticoagulant_weichi:"" }}
@@ -718,8 +733,23 @@
                 <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 16">iu</span>
                 <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 16">iu</span>
 
-                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 17">mg</span>
-                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 17">mg</span>
+                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 17">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg/h</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644"> U/h</span>
+                </span>
+                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 17">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg/h</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644"> U/h</span>
+                </span>
+
+                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 14">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg/h</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644"> iu/h</span>
+                </span>
+                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 14">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg/h</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644"> iu/h</span>
+                </span>
 
                 总量: 
                 {{  patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant_zongliang?patient.prescription&&patient.prescription.anticoagulant_zongliang:"" }}
@@ -762,8 +792,23 @@
                 <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 16">iu</span>
                 <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 16">iu</span>
 
-                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 17">mg</span>
-                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 17">mg</span>
+                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 17">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644">U</span>
+                </span>
+                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 17">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644">U</span>
+                </span>
+
+                <span v-if="patient.prescription!=null&&patient.prescription&&patient.prescription.anticoagulant == 14">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644"> iu</span>
+                </span>
+                <span v-if="patient.prescription==null&&patient.dialysis_solution&&patient.dialysis_solution.anticoagulant == 14">
+                  <span v-if="$store.getters.user.template_info.org_id !=10644"> mg</span>
+                  <span v-if="$store.getters.user.template_info.org_id ==10644"> iu</span>
+                </span>
 
 
               </p>
@@ -901,13 +946,36 @@
           <li>
             <span class="iconfont">&#xe6de;</span>
             床位号 :
-            {{
+            <span v-if="$store.getters.user.template_info.org_id ==10340">
+              <span style="color:blue" v-if="patient.dialysis_order && patient.dialysis_order.device_number!=undefined && (patient.dialysis_order.device_number.id == 4414 || patient.dialysis_order && patient.dialysis_order.device_number.id == 4449 || patient.dialysis_order && patient.dialysis_order.device_number.id == 4456 || patient.dialysis_order && patient.dialysis_order.device_number.id == 4416 || patient.dialysis_order && patient.dialysis_order.device_number.id == 4448 || patient.dialysis_order && patient.dialysis_order.device_number.id == 4468 || patient.dialysis_order && patient.dialysis_order.device_number.id == 4451 || patient.dialysis_order && patient.dialysis_order.device_number.id == 4457 || patient.dialysis_order && patient.dialysis_order.device_number.id == 4495)">
+
+                {{
+                patient.dialysis_order &&
+                patient.dialysis_order.device_number &&
+                patient.dialysis_order.device_number.number.length > 0
+                  ? patient.dialysis_order.device_number.number
+                  : patient.device_number.number
+               }}
+              </span> 
+              <span v-else>
+                {{
+                  patient.dialysis_order &&
+                  patient.dialysis_order.device_number &&
+                  patient.dialysis_order.device_number.number.length > 0
+                    ? patient.dialysis_order.device_number.number
+                    : patient.device_number.number
+               }}
+              </span>
+            </span>
+            <span v-if="$store.getters.user.template_info.org_id!=10340">
+              {{
               patient.dialysis_order &&
               patient.dialysis_order.device_number &&
               patient.dialysis_order.device_number.number.length > 0
                 ? patient.dialysis_order.device_number.number
                 : patient.device_number.number
             }}
+            </span>
           </li>
           <li>
             <span class="iconfont">&#xe6f6;</span>
@@ -1055,7 +1123,7 @@
 
     <!-- 消毒弹窗 -->
     <van-popup
-      v-if="$store.getters.user.template_info.org_id!=9671"
+      v-if="$store.getters.user.template_info.org_id==9671"
       title="消毒时间"
       v-model="showPlan"
       class="appPopup"
@@ -1143,7 +1211,7 @@
 
 
     <van-popup
-      v-if="$store.getters.user.template_info.org_id==9671"
+      v-if="$store.getters.user.template_info.org_id!=9671"
       title="消毒时间"
       v-model="showPlan"
       class="appPopup"
@@ -1256,7 +1324,7 @@
           </div>
 
           <div class="item">
-            <h2 class="name">床位更换:</h2>
+            <h2 class="name">床单位更换:</h2>
             <div class="content" @click="showPicker5 = true">
               <span
                 class="text"
@@ -1267,6 +1335,43 @@
             </div>
           </div>
 
+          <div class="item">
+            <h2 class="name">透析机消毒液(更换):</h2>
+            <div class="content" @click="showPicker6 = true">
+              <span
+                class="text"
+                style="width: 100px"
+                >{{ kuangvalue6 }}</span
+              >
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+
+
+          <div class="item">
+            <h2 class="name">空气滤网清洁:</h2>
+            <div class="content" @click="showPicker7 = true">
+              <span
+                class="text"
+                style="width: 100px"
+                >{{ kuangvalue7 }}</span
+              >
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+
+          <div class="item">
+            <h2 class="name">细菌过滤器(更换):</h2>
+            <div class="content" @click="showPicker8 = true">
+              <span
+                class="text"
+                style="width: 100px"
+                >{{ kuangvalue8 }}</span
+              >
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+
 
         </div>
 
@@ -1332,6 +1437,33 @@
             @confirm="onConfirmFour"
           />
         </van-popup>
+
+        <van-popup v-model:show="showPicker6" round position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="listOne"
+            @cancel="showPicker6=false"
+            @confirm="onConfirmFive"
+          />
+        </van-popup>
+
+        <van-popup v-model:show="showPicker7" round position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="listTwo"
+            @cancel="showPicker7=false"
+            @confirm="onConfirmSix"
+          />
+        </van-popup>
+
+        <van-popup v-model:show="showPicker8" round position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="listThree"
+            @cancel="showPicker8=false"
+            @confirm="onConfirmSeven"
+          />
+        </van-popup>
       </div>
     </van-popup>
   </div>
@@ -1356,9 +1488,9 @@ import {
   getDialysisRecordOrde
 } from '@/api/dialysis'
 const moment = require('moment')
-import { getDisInfectionTime, SaveDisinfetionInfo } from '@/api/manage'
+import { getDisInfectionTime, SaveDisinfetionInfo,SaveDisinfetionInfoOne } from '@/api/manage'
 import { GetRemindLongAdviceOne } from '@/api/advice'
-import { Console } from 'console'
+import { Console, info } from 'console'
 export default {
   name: 'PatientBox',
   components: {
@@ -1403,6 +1535,8 @@ export default {
       showPicker4:false,
       showPicker5:false,
       showPicker6:false,
+      showPicker7:false,
+      showPicker8:false,
       receiver_treatment_access: {}, // 接诊评估
       predialysis_evaluation: {}, // 透前评估
       last_predialysis_evaluation: {}, // 上次透前评估
@@ -1484,6 +1618,8 @@ export default {
     kuangvalue4:"",
     kuangvalue5:"",
     kuangvalue6:"",
+    kuangvalue7:"",
+    kuangvalue8:"",
     // 机表消毒方式
     disinfectType: [
       { value: 0, text: "/" },
@@ -1497,7 +1633,9 @@ export default {
       { value: 2, text: "500mg/l含氯消毒剂" },
       { value: 3, text: "1000mg/l含氯消毒剂" },
       { value: 4, text: "1500mg/l含氯消毒剂" },
-      { value: 5,  text:"消毒湿巾"}
+      { value: 5,  text:"消毒湿巾"},
+      { value: 6,  text:"1.85g/L季铵盐"},
+      { value:7,   text:"2000mg/l含氯消毒剂"}
     ],
     // 夜路消毒方式
     sterilizeType: [
@@ -1523,6 +1661,7 @@ export default {
         { value: 8, text: "50%冰醋酸" },
         { value: 9, text: "5%次氯酸钠" },
         { value: 10,text:"25%的柠檬酸+5%次氯酸钠"},
+        { value: 11,text:"20%柠檬酸+5%次氯酸钠"}
       ],
        // 床单位更换
        bedType: [
@@ -1531,6 +1670,20 @@ export default {
         { value: 2, text: "被套" },
         { value: 3, text: "枕套" },
 
+      ],
+
+       // 床单位更换
+       listOne: [
+        { value: 1, text: "更换" },
+        { value:2,text:"未更换"},
+      ],
+      listTwo: [
+        { value: 1, text: "清洁" },
+        { value: 2,  text:"未清洁"},
+      ],
+      listThree: [
+        { value: 1, text: "更换" },
+        { value: 2,  text:"未更换"},
       ],
       timenow:0,
       last_befor:{},
@@ -2587,7 +2740,7 @@ export default {
       this.zone_id = schedual.device_number.zone.id
       this.patient_id = schedual.patient_id
       this.mode_id = schedual.mode_id
-      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 == 10318) {
         console.log('下机时间', schedual.dialysis_order.end_time)
         if (schedual && schedual.dialysis_order != null) {
           this.start_time_str = this.getTimeTwo(schedual.dialysis_order.end_time)
@@ -2600,7 +2753,7 @@ export default {
         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 || this.$store.getters.user.template_info.org_id == 10101) {
+      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 || this.$store.getters.user.template_info.org_id == 10318) {
         getDialysisRecordOrde(params).then((response) => {
           if (response.data.state == 1) {
             var order = response.data.data.order
@@ -2678,16 +2831,18 @@ 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
+           way = this.disinfectType[i].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
+          if(this.kuangvalue2 == this.disinfectantType[i].text){
+            machine_disinfectant = this.disinfectantType[i].value
           }
       }
 
@@ -2705,13 +2860,41 @@ export default {
          }
       }
 
+      console.log("bedType",this.bedType)
       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
+            bed_way = this.bedType[i].value
         }
       }
 
+      var dialysis_checked  =0 
+
+      if(this.kuangvalue6 == "更换"){
+        dialysis_checked = 1
+      }
+      if(this.kuangvalue6 == "未更换"){
+        dialysis_checked = 0
+      }
+
+      var clean  =0 
+
+      if(this.kuangvalue7 == "清洁"){
+        clean = 1
+      }
+      if(this.kuangvalue7 == "未清洁"){
+        clean = 0
+      }
+
+      var germ_checked =0
+      if(this.kuangvalue8 == "更换"){
+          germ_checked =1
+      }
+      if(this.kuangvalue8 == "未更换"){
+          germ_checked =0
+      }
+      console.log("kuangvalue",this.kuangvalue5)
+
       const params = {
         bed_id: this.bed_id,
         start_time: this.start_time_str,
@@ -2727,7 +2910,11 @@ export default {
         disinfectant_way:disinfectant_way,
         disinfectant:disinfectant,
         bed_way:bed_way,
+        dialysis_checked:dialysis_checked,
+        clean:clean,
+        germ_checked:germ_checked,
       }
+     
       if (this.disinfec_time == '') {
         this.$toast('消毒时长不能为空!')
         return false
@@ -2737,8 +2924,8 @@ export default {
         return false
       }
       console.log('params', params)
-
-      SaveDisinfetionInfo(params).then((response) => {
+    
+      SaveDisinfetionInfoOne(params).then((response) => {
         if (response.data.state == 1) {
           var information = response.data.data.information
 
@@ -2793,6 +2980,69 @@ export default {
       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终端
+
+      var way = 0
+      for(let i=0;i<this.disinfectType.length;i++){
+        if(this.kuangvalue == this.disinfectType[i].text){
+           way = this.disinfectType[i].value
+        }
+      }
+     
+      var machine_disinfectant =0
+      for(let i=0;i<this.disinfectantType.length;i++){
+          if(this.kuangvalue2 == this.disinfectantType[i].text){
+            machine_disinfectant = this.disinfectantType[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
+         }
+      }
+
+      console.log("bedType",this.bedType)
+      var bed_way =0
+      for(let i=0;i<this.bedType.length;i++){
+        if(this.kuangvalue5 == this.bedType[i].text){
+            bed_way = this.bedType[i].value
+        }
+      }
+
+      var dialysis_checked  =0 
+
+      if(this.kuangvalue6 == "更换"){
+        dialysis_checked = 1
+      }
+      if(this.kuangvalue6 == "未更换"){
+        dialysis_checked = 0
+      }
+
+      var clean  =0 
+
+      if(this.kuangvalue7 == "清洁"){
+        clean = 1
+      }
+      if(this.kuangvalue7 == "未清洁"){
+        clean = 0
+      }
+
+      var germ_checked =0
+      if(this.kuangvalue8 == "更换"){
+          germ_checked =1
+      }
+      if(this.kuangvalue8 == "未更换"){
+          germ_checked =0
+      }
+      console.log("kuangvalue",this.kuangvalue5)
       const params = {
         bed_id: this.bed_id,
         start_time: this.start_time_str,
@@ -2802,14 +3052,22 @@ 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,
+        way:way,
+        machine_disinfectant:machine_disinfectant,
+        disinfectant_way:disinfectant_way,
+        disinfectant:disinfectant,
+        bed_way:bed_way,
+        dialysis_checked:dialysis_checked,
+        clean:clean,
+        germ_checked:germ_checked,
       }
       if (this.disinfec_time == '') {
         this.$toast('消毒时长不能为空!')
         return false
       }
       // console.log("params",params)
-      SaveDisinfetionInfo(params).then((response) => {
+      SaveDisinfetionInfoOne(params).then((response) => {
         if (response.data.state == 1) {
           var information = response.data.data.information
 
@@ -2880,49 +3138,62 @@ export default {
 
           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 planObj = response.data.data.planObj
+          
+          console.log("plaobj",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.disinfectType[i].text
+              }
+            }
+            this.kuangvalue =way
+
+
+            //机表(床单元、床旁桌)消毒液
+            var machine_disinfectant = ""
+            for(let i=0;i<this.disinfectantType.length;i++){
+                if(planObj.machine_disinfectant == this.disinfectantType[i].value){
+                  machine_disinfectant = this.disinfectantType[i].text
+                }
+            }
+            console.log("machine_disinfectant",machine_disinfectant)
+            this.kuangvalue2 = machine_disinfectant
+
+
+            // 夜路消毒方式
+            var disinfectant_way = ""
+            for(let i=0;i<this.sterilizeType.length;i++){
+              if(planObj.disinfectan_way == this.sterilizeType[i].value){
+                disinfectant_way = this.sterilizeType[i].text
+              }
+            }
+            console.log("machine_disinfectant",disinfectant_way)
+            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
+              }
+            }
+            console.log("machine_disinfectant",disinfectant)
+            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
+              }
+            }
+            console.log("machine_disinfectant",bed_type)
+            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)
@@ -2968,6 +3239,85 @@ export default {
               '{y}-{m}-{d} {h}:{i}'
             )
             this.disinfec_time = infomation.long_time
+
+
+            if(infomation!="" && infomation!=undefined){
+              var way = ""
+              for(let i=0;i<this.disinfectType.length;i++){
+                if(infomation.disinfect_type == this.disinfectType[i].value){
+                  way = this.disinfectType[i].text
+                }
+              }
+              this.kuangvalue =way
+
+
+            //机表(床单元、床旁桌)消毒液
+            var machine_disinfectant = ""
+            for(let i=0;i<this.disinfectantType.length;i++){
+                if(infomation.disinfectant_type == this.disinfectantType[i].value){
+                  machine_disinfectant = this.disinfectantType[i].text
+                }
+            }
+           
+            this.kuangvalue2 = machine_disinfectant
+
+
+            // 夜路消毒方式
+            var disinfectant_way = ""
+            for(let i=0;i<this.sterilizeType.length;i++){
+              if(infomation.fluid_path == this.sterilizeType[i].value){
+                disinfectant_way = this.sterilizeType[i].text
+              }
+            }
+            console.log("machine_disinfectant",disinfectant_way)
+            this.kuangvalue3 = disinfectant_way
+
+            //液路消毒液
+            var disinfectant=""
+            for(let i=0;i<this.fluidPathType.length;i++){
+              if(infomation.disinfectant == this.fluidPathType[i].value){
+                 disinfectant = this.fluidPathType[i].text
+              }
+            }
+            console.log("machine_disinfectant",disinfectant)
+            this.kuangvalue4 = disinfectant
+
+           // 床单位更换
+            var bed_type = ""
+            for(let i=0;i<this.bedType.length;i++){
+              if(infomation.bed_way == this.bedType[i].value){
+                 bed_type = this.bedType[i].text
+              }
+            }
+            console.log("machine_disinfectant",bed_type)
+            this.kuangvalue5 =bed_type
+
+
+            if(infomation.dialysis_checked == 1){
+               this.kuangvalue6 = "更换"
+            }
+
+            if(infomation.dialysis_checked == 2){
+               this.kuangvalue6 = "未更换"
+            }
+
+            if(infomation.germ_checked == 1){
+               this.kuangvalue8 = "更换"
+            }
+
+            if(infomation.germ_checked == 2){
+               this.kuangvalue8 = "未更换"
+            }
+
+            if(infomation.clean == 1){
+               this.kuangvalue7 = "清洁"
+            }
+
+            if(infomation.clean == 2){
+               this.kuangvalue7 = "未清洁"
+            }
+ 
+           }
           }
         } else {
           this.planStatus = 1
@@ -3094,9 +3444,35 @@ export default {
         }
       }
       this.showPicker5=false
+    },
+    onConfirmFive(val){
+      for(let i=0;i<this.listOne.length;i++){
+        if(val.id==this.listOne[i].id){
+          this.kuangvalue6=val.text
+        }
+      }
+      this.showPicker6=false
+    },
+    onConfirmSix(val){
+      for(let i=0;i<this.listTwo.length;i++){
+        if(val.id==this.listTwo[i].id){
+          this.kuangvalue7=val.text
+        }
+      }
+      this.showPicker7=false
+    },
+    onConfirmSeven(val){
+      for(let i=0;i<this.listThree.length;i++){
+        if(val.id==this.listThree[i].id){
+          this.kuangvalue8=val.text
+        }
+      }
+      this.showPicker8=false
     }
 
 
+
+
   },
   created () {
     
@@ -3113,7 +3489,7 @@ export default {
     
     var arrDateTwo = (timeStampOne/1000)-28800
 
-    console.log("时间搓2222",arrDateTwo)
+    // console.log("时间搓2222",arrDateTwo)
 
     this.timenow = arrDateTwo
   },

src/pages/main/WaitingArea.vue

@@ -555,14 +555,14 @@ export default {
       }
       this.zoneMap = zoneMap
       var zones = []
-      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
+      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区',sort:0 })
       for (var zoneName in zoneMap) {
-        zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName })
+        zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName,sort:zoneMap[zoneName].sort })
       }
 
       zones = zones.sort(function (a, b) {
-        return a.value > b.value
-      })
+         return a.sort - b.sort
+       })
 
       var total = 0
       if (this.scheduals != null && this.scheduals.length > 0) {
@@ -1045,13 +1045,13 @@ export default {
       }
       this.zoneMap = zoneMap
       var zones = []
-      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
+      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区',sort:0 })
       for (var zoneName in zoneMap) {
-        zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName })
+        zones.push({ value: zoneMap[zoneName].id, text: zoneName, zone_name: zoneName,sort:zoneMap[zoneName].sort })
       }
 
       zones = zones.sort(function (a, b) {
-        return a.value > b.value
+          return a.sort - b.sort
       })
 
       var total = 0
@@ -1067,6 +1067,7 @@ export default {
         if (zones[i].value == 0) {
           zones[i].zone_name = zones[i].text
           zones[i].text = zones[i].text + '(' + total + ')'
+          zones[i].sort= zones[i].sort
         }
       }
       this.zonesList = zones
@@ -1145,10 +1146,10 @@ export default {
       }
 
       var zones = []
-      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
+      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区',sort:0 })
 
       for (var zoneId in zoneMap) {
-        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name, zone_name: zoneMap[zoneId].name })
+        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name, zone_name: zoneMap[zoneId].name,sort:zoneMap[zoneId].sort })
       }
       console.log('zones233223232wi', zones)
       return zones
@@ -1293,13 +1294,13 @@ export default {
       let patientArr = this.zone_scheduals
 
       var zones = []
-      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
+      zones.push({ value: 0, text: '全部分区', zone_name: '全部分区',sort:0 })
       for (var zoneName in this.zoneMap) {
-        zones.push({ value: this.zoneMap[zoneName].id, text: zoneName, zone_name: zoneName })
+        zones.push({ value: this.zoneMap[zoneName].id, text: zoneName, zone_name: zoneName,sort:this.zoneMap[zoneName].sort })
       }
       zones = zones.sort(function (a, b) {
-        return a.value > b.value
-      })
+          return a.sort - b.sort
+       })
        console.log("this.zone_scheduals",this.zone_scheduals)
      
      
@@ -1322,6 +1323,7 @@ export default {
               zones[i].text = '全部分区'
               zones[i].zone_name = '全部分区'
               zones[i].text = zones[i].text + '(' + total + ')'
+              zones[i].sort = 0
             }
             if (zones[i].text == this.zone_scheduals[j].zone_name) {
               zones[i].text = zones[i].text + '(' + this.zone_scheduals[j].bedList.length + ')'
@@ -1349,6 +1351,7 @@ export default {
               zones[i].text = '全部分区'
               zones[i].zone_name = '全部分区'
               zones[i].text = zones[i].text + '(' + total + ')'
+              zones[i].sort = 0
             }
             if (zones[i].text == this.zone_scheduals[j].zone_name) {
               zones[i].text = zones[i].text + '(' + this.zone_scheduals[j].bedList.length + ')'

src/pages/main/beforeDialysis/consumablesDetailOne.vue

@@ -168,7 +168,7 @@
             
             var arrDateTwo = (timeStampOne/1000)-28800
 
-            console.log("时间搓2222",arrDateTwo)
+            // console.log("时间搓2222",arrDateTwo)
             this.query.schedule_type = this.$route.query.schedual_type_selected
             this.query.partion_id = this.$route.query.partion_id
           getPrescriptionList(this.query).then(response=>{

src/pages/main/dialysis/Standingorder.vue

@@ -417,6 +417,7 @@ import { Dialog,Toast} from 'vant'
           this.deliveryWayOptions = response.data.data.drugways === null ? []: response.data.data.drugways
           this.executionFrequencyOptions = response.data.data.efs === null ? [] : response.data.data.efs
           this.adviceTemplates = response.data.data.advice_templates === null ? []  : response.data.data.advice_templates
+          console.log("模版内容----------------------------",this.adviceTemplates)
         }
       })
      },

src/pages/main/dialysis/components/drugTemplate.vue

@@ -105,6 +105,7 @@ export default {
   },
   created () {
     this.items = this.templates
+    console.log("模版内容----------------------------",this.items)
     this.record_date_str = parseTime(new Date(), '{y}-{m}-{d}')
     var nowDate = new Date()
     var nowYear = nowDate.getFullYear()

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

@@ -109,6 +109,9 @@ export default {
   },
   created () {
     this.items = this.templates
+    this.items.sort(this.compare('sort'))
+    console.log("模版民初=====================",this.items)
+
     this.record_date_str = parseTime(new Date(), '{y}-{m}-{d}')
     if (this.$store.getters.user.org.id == 10101) {
       if (this.predialysis.created_time > 0) {
@@ -209,6 +212,13 @@ export default {
     }
   },
   methods: {
+    compare (property) {
+        return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1-value2
+        }
+    },
     backAction: function () {
       this.$emit('back')
     },

src/pages/main/newActionBar/consumables.vue

@@ -88,6 +88,7 @@ export default {
   },
   methods: {
     stockOut () {
+      console.log("进哈哈哈哈哈哈",this.uploadMethod)
       this.loading = true
       if (this.color == 1) {
         if (this.uploadMethod == 1) {

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -399,9 +399,12 @@
            <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 && $store.getters.user.template_info.org_id!=10679 && $store.getters.user.template_info.org_id!=10510 && $store.getters.user.template_info.org_id!=10702 && $store.getters.user.template_info.org_id!=10480">
                       <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 !=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|| $store.getters.user.template_info.org_id !=10679 || $store.getters.user.template_info.org_id !=10510   ">首剂
+                      <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|| $store.getters.user.template_info.org_id !=10679 || $store.getters.user.template_info.org_id !=10510   ">首剂
                         <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 v-if="$store.getters.user.template_info.org_id != 9538">
+                          <span v-if="dialysisPrescription.anticoagulant == 17">(U)</span> 
+                          <span v-if="dialysisPrescription.anticoagulant != 17">(iu)</span>
+                        </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>
@@ -421,6 +424,7 @@
                        <!-- <span v-else>首剂(iu)</span> -->
                       </span>
                       <span v-if="dialysisPrescription.anticoagulant == 11">首剂(iu)</span>
+                     
                       <span v-if="dialysisPrescription.anticoagulant == 4">首剂(mg)</span>
                   </template>
 
@@ -511,9 +515,10 @@
               <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/h)</span
-              >
+              <span v-if="$store.getters.user.template_info.org_id != 9538">
+                <span v-if="dialysisPrescription.anticoagulant == 17">(U/h)</span> 
+                <span v-if="dialysisPrescription.anticoagulant != 17">(iu/h)</span>
+              </span>
             </span>
             <span
               v-if="
@@ -563,12 +568,18 @@
             <span v-if="dialysisPrescription.anticoagulant == 5"
               >维持(ml/h)</span
             >
-            <span v-if="dialysisPrescription.anticoagulant == 16 || dialysisPrescription.anticoagulant == 15"
+            <span v-if="dialysisPrescription.anticoagulant == 16 || dialysisPrescription.anticoagulant == 15 || dialysisPrescription.anticoagulant == 14"
               >维持(iu/h)</span
             >
             
-            <span v-if="dialysisPrescription.anticoagulant == 1 || dialysisPrescription.anticoagulant == 17"
-              >维持(mg/h)</span
+            <span v-if="dialysisPrescription.anticoagulant == 1"
+              >维持
+                (mg/h)
+              </span
+            >
+            <span v-if=" dialysisPrescription.anticoagulant == 17"
+              >维持(U/h)
+              </span
             >
             <span v-if="dialysisPrescription.anticoagulant == 6">
               <span
@@ -676,9 +687,10 @@
               <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 v-if="$store.getters.user.template_info.org_id != 9538">
+                <span v-if="dialysisPrescription.anticoagulant == 17">(U)</span> 
+                <span v-if="dialysisPrescription.anticoagulant != 17">(iu)</span>
+              </span>
             </span>
             <span
               v-if="
@@ -715,7 +727,11 @@
               <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>
+             
+              <span v-else>
+                 <span v-if=" dialysisPrescription.anticoagulant == 17"> 总量(U)</span>
+                 <span v-if=" dialysisPrescription.anticoagulant != 17"> 总量(iu)</span>
+                </span>
             </span>
             <span v-if="dialysisPrescription.anticoagulant == 4">总量(mg)</span>
             <span v-if="dialysisPrescription.anticoagulant == 1">总量(mg)</span>
@@ -735,7 +751,7 @@
               >
               <span v-else>总量(iu)</span>
             </span>
-            <span v-if="dialysisPrescription.anticoagulant == 11 || dialysisPrescription.anticoagulant == 13|| dialysisPrescription.anticoagulant == 15|| dialysisPrescription.anticoagulant == 16"
+            <span v-if="dialysisPrescription.anticoagulant == 11 || dialysisPrescription.anticoagulant == 13 || dialysisPrescription.anticoagulant == 14 || dialysisPrescription.anticoagulant == 15|| dialysisPrescription.anticoagulant == 16"
               >总量(iu)</span
             >
           </template>
@@ -1076,7 +1092,8 @@
                 ($store.getters.user.template_info.template_id == 21 ||
                   $store.getters.user.template_info.template_id == 29 ||
                   $store.getters.user.template_info.template_id == 53) &&
-                  $store.getters.user.template_info.org_id != 10249
+                  $store.getters.user.template_info.org_id != 10249 &&
+                  $store.getters.user.template_info.org_id != 9538
               "
               >置换液总量
               <span v-if="dialysisPrescription.mode_id !=26"> (ml)</span>
@@ -1088,11 +1105,14 @@
                 ($store.getters.user.template_info.template_id != 21 &&
                   $store.getters.user.template_info.template_id != 29 &&
                   $store.getters.user.template_info.template_id != 53) ||
-                $store.getters.user.template_info.org_id == 10249
+                  $store.getters.user.template_info.org_id == 10249 
+                 
+
               "
               >置换液总量
-              <span v-if="dialysisPrescription.mode_id !=26"> (ml)</span>
-              <span v-if="dialysisPrescription.mode_id ==26"> (L/h)</span>
+              <span v-if="dialysisPrescription.mode_id !=26 &&  $store.getters.user.template_info.org_id != 9538"> (ml)</span>
+              <span v-if="dialysisPrescription.mode_id ==26 &&  $store.getters.user.template_info.org_id != 9538"> (L/h)</span>
+              <span v-if="$store.getters.user.template_info.org_id == 9538"> (L)</span>
               </span
             >
           </template>
@@ -10274,7 +10294,8 @@ export default {
             treatment_mode_id === 14 ||
             treatment_mode_id === 15 ||
             treatment_mode_id === 16 ||
-            treatment_mode_id === 19
+            treatment_mode_id === 19 ||
+            treatment_mode_id === 42
           ) {
 
             this.zhiShow = false;

src/pages/main/newActionBar/monitoring.vue

@@ -44,8 +44,8 @@
                   <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('跨膜压1')" 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 || org_id == 10485 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id ==10580 || org_id ==10629 || org_id ==10617 || org_id==10677 || org_id==10667 || org_id==10693 || org_id ==10702 || org_id ==10697 || org_id ==10635)" 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 && org_id!=10597 && org_id!=10599&&org_id!=10612 &&org_id!=10580 && org_id !=10629 && org_id!=10617 && org_id!=10677 && org_id!=10667 && org_id!=10693 && org_id!=10702  && org_id!=10697 && org_id!=10635" 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 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id ==10580 || org_id ==10629 || org_id ==10617 || org_id==10677 || org_id==10667 || org_id==10693 || org_id ==10702 || org_id ==10697 || org_id ==10635) && org_id!=10471" 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 && org_id!=10597 && org_id!=10599&&org_id!=10612 &&org_id!=10580 && org_id !=10629 && org_id!=10617 && org_id!=10677 && org_id!=10667 && org_id!=10693 && org_id!=10702  && org_id!=10697 && org_id!=10635) || org_id ==10471" width="50px" style="width:6%"> 超滤量 <br />(L) </th>
 
                   <th v-if="isShow('超滤量1')" width="50px" style="width:6%"> 超滤量 <br />(ml) </th>
 

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -438,8 +438,8 @@
                     <div class="under_line" style="width: 100px;text-align: center">
                       {{prescription.target_ultrafiltration?prescription.target_ultrafiltration:'/'}}
                     </div>
-                    <span v-if="org_id == 9829 || org_id==10440 || org_id==10469 || org_id==10471|| org_id == 10460 || org_id ==10644">ml</span>
-                    <span v-if="org_id!= 9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460 && org_id!=10644"> L</span>
+                    <span v-if="org_id == 9829 || org_id==10440 || org_id==10469 || org_id == 10460 || org_id ==10644">ml</span>
+                    <span v-if="org_id!= 9829 && org_id!=10440 && org_id!=10469 && org_id!=10460 && org_id!=10644"> L</span>
                   </div>
                   <div class="inline_block" style="flex:1;" v-if="org_id!=10644">
                     处方脱水量：
@@ -506,6 +506,11 @@
                       <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 v-if="prescription.anticoagulant == 14">
+                        <span v-if="org_id!=10644">mg</span> 
+                        <span v-if="org_id==10644">iu</span> 
+                      </span>
+                      <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
 
                     <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id ==10206">
@@ -521,8 +526,12 @@
                      <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 v-if="prescription.anticoagulant == 17">U</span>
+                     <span v-if="prescription.anticoagulant == 14">
+                      <span v-if="org_id!=10644">mg</span> 
+                      <span v-if="org_id==10644">iu</span> 
+                     </span>
+                  
 
                     </span>
 
@@ -543,6 +552,11 @@
                         <span v-if="prescription.anticoagulant == 3">iu/h</span>
                         <span v-if="prescription.anticoagulant == 2">iu/h</span>
                         <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                        <span v-if="prescription.anticoagulant == 14">
+                          <span v-if="org_id!=10644">mg/h</span> 
+                          <span v-if="org_id==10644">iu/h</span> 
+                        </span>
+                        <span v-if="prescription.anticoagulant == 17">U/h</span>
                      </span>
                     <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>
@@ -557,7 +571,11 @@
                         <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 v-if="prescription.anticoagulant == 17">U/h</span>
+                        <span v-if="prescription.anticoagulant == 14">
+                          <span v-if="org_id!=10644">mg/h</span> 
+                          <span v-if="org_id==10644">iu/h</span> 
+                        </span>
                     </span>
 
                   </div>
@@ -585,6 +603,11 @@
                       <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 v-if="prescription.anticoagulant == 14">
+                        <span v-if="org_id!=10644">mg</span> 
+                        <span v-if="org_id==10644">iu</span> 
+                      </span>
+                      <span v-if="prescription.anticoagulant == 17">U</span>
                      </span>
                     <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>
@@ -599,7 +622,11 @@
                       <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 v-if="prescription.anticoagulant == 17">U</span>
+                      <span v-if="prescription.anticoagulant == 14">
+                        <span v-if="org_id!=10644">mg</span> 
+                        <span v-if="org_id==10644">iu</span> 
+                      </span>
 
                     </span>
 
@@ -729,23 +756,27 @@
                       <td width="60" v-if="org_id != 9836 && org_id!=9919 && org_id!=10679 && org_id!=10644">透析液温度(°C)</td>
 
                       <td width="50" v-if="org_id != 10121 && org_id != 9675 && org_id != 0 && org_id!=10490 && org_id!=10679 && org_id!=10644" >电导度<br />(ms/cm)</td>
-                      <td
+                      
+                        <td
                           width="50"
                           v-if="
-                            org_id == 10121 || org_id == 9675
+                            org_id == 10490 
                           "
                         >
-                          SpO₂<br />(%)
+                        置换液速度<br />(ml/h)
                         </td>
-                        <td
+                      <td width="50" v-if="org_id !=3877 && org_id!=10449&& org_id!=10683">超滤量<br/>
+                        <span v-if="org_id!=10471"> (ml)</span>
+                        <span v-if="org_id==10471">L</span>
+                      </td>
+                      <td
                           width="50"
                           v-if="
-                            org_id == 10490 
+                            org_id == 10121 || org_id == 9675 || org_id == 9829
                           "
                         >
-                        置换液速度<br />(ml/h)
+                          SpO₂<br />(%)
                         </td>
-                      <td width="50" v-if="org_id !=3877 && org_id!=10449&& org_id!=10683">超滤量<br/>(ml)</td>
                       <td width="50" v-if="org_id ==10683">超滤率<br/>(ml/h)</td>
                       <td width="50" v-if="org_id == 10375">置换率<br/>(ml/min)</td>
                       <td
@@ -759,9 +790,9 @@
                       <td width="50" v-if="org_id == 10449 || org_id == 3877">累计超滤量<br/>(ml)</td>
                       <td v-if="(org_id!=10683 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))" width="50">置换量<br/>(ml)</td>
                       <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压<br/>(mmHg)</td>
-                      <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id ==10629 ">KT/V</td>
+                      <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id ==10629">KT/V</td>
                       <td width="50" v-if="org_id == 9919">在线尿素监测</td>
-                      <td width="50" v-if="org_id != 9919 && org_id!=9538 && org_id!=9675 && org_id!=10617 && org_id!=10629&&org_id!=10644&& org_id!=10679&& org_id!=10683">KT/V</td>
+                      <td width="50" v-if="org_id != 9919 && org_id!=9538 && org_id!=9675 && org_id!=10617 && org_id!=10629&&org_id!=10644&& org_id!=10679&& org_id!=10683 && org_id!=9829">KT/V</td>
                       <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id == 9919">血容量<br />(L)</td>
                       <td width="50" v-if="org_id ==10490">碳酸氢钠用量<br />(ml)</td>
                       <td width="200">病情变化及处理</td>
@@ -780,7 +811,7 @@
                       <td v-if="monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time"> {{  monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
                       <td v-if="org_id != 9836 && org_id!=10679 && org_id!=10644 ">{{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}</td>
                       <td v-if="org_id == 9836">{{ monitor.temperature ? monitor.temperature : "" }}</td>
-                      <td v-if="org_id == 10121 || org_id == 9675 || org_id == 0 ">{{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}</td>
+                 
                       <td v-if="org_id != 9538 &&org_id != 10121 &&org_id != 9675 &&org_id != 0 && org_id!=10679 && org_id!=10644">{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
                       <td v-if="org_id == 10490 ">{{monitor.replacement_speed? monitor.replacement_speed: ""}}</td>
                       <td v-if="org_id == 9538">{{monitor.sodium_concentration? monitor.sodium_concentration: ""}}</td>
@@ -795,6 +826,7 @@
                         </span>
                        
                       </td>
+                      <td v-if="org_id == 10121 || org_id == 9675 || org_id == 0 || org_id == 9829">{{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}</td>
                       <td width="50" v-if="org_id ==10683">
                         <br/>{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate:"" }}</td>
                       <td v-if="org_id == 10375">

src/pages/main/today/dialysisPrescription.vue

@@ -117,7 +117,8 @@
             <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 class="unit" v-if="this.prescription.anticoagulant == 17">{{anticoagulant_shouji != '0'?"U":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 14">{{anticoagulant_shouji != '0'?"iu":""}}</span>
           </span>
           <span v-else>
             <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_shouji != '0'?"mg":""}}</span>
@@ -158,7 +159,8 @@
             <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 class="unit" v-if="this.prescription.anticoagulant == 14">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 17">{{anticoagulant_weichi != '0'?"U/h":""}}</span>
           </span>
         </li>
 
@@ -189,7 +191,8 @@
             <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 class="unit" v-if="this.prescription.anticoagulant == 17">{{anticoagulant_zongliang != '0'?"U":""}}</span>
+            <span class="unit" v-if="this.prescription.anticoagulant == 14">{{anticoagulant_zongliang != '0'?"iu":""}}</span>
           </span>
           <span v-else>
             <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_zongliang != '0'?"mg":""}}</span>

src/pages/monitoring/index.vue

@@ -217,7 +217,7 @@
             </td>
             <td width="12.5%">
             
-              <span v-if='item.monitoring_record!=null&&item.monitoring_record.length > 0 && item.monitoring_record.length <= 7' style="display: flex;justify-content: space-between;">
+              <span v-if='item.monitoring_record!=null&&item.monitoring_record.length > 0 && item.monitoring_record.length <= 9' style="display: flex;justify-content: space-between;">
                 <td width='16%' v-for="(i,newindex) in item.monitoring_record" :key='newindex'>
                   <span v-if="$store.getters.user.template_info.org_id != 10693">
                      <span :class="isRangeInSBP(i.systolic_blood_pressure.toString())">{{ i.systolic_blood_pressure.toString() }}</span>/<span :class="isRangeInDBP(i.diastolic_blood_pressure.toString())">{{ i.diastolic_blood_pressure.toString() }}</span>&nbsp;
@@ -228,11 +228,11 @@
                      <!-- <span :class="isRangeInSBP(i.monitor_systolic_blood_pressure_one.toString())">{{ i.monitor_systolic_blood_pressure_one.toString() }}</span>/<span :class="isRangeInDBP(i.monitor_diastolic_blood_pressure_one.toString())">{{ i.monitor_diastolic_blood_pressure_one.toString() }}</span>&nbsp; -->
                   </span> 
                 </td>
-                <td width='16%' v-for="(i,newindex) in 7 - item.monitoring_record.length" :key="newindex + 'i'"></td>
+                <td width='16%' v-for="(i,newindex) in 9 - item.monitoring_record.length" :key="newindex + 'i'"></td>
               </span>
               <span v-else style="display: flex;justify-content: space-between;">
                 <span v-if="item.monitoring_record!=null">
-                <td width='16%' v-for="(i,newindex) in item.monitoring_record.slice(0,7)" :key='newindex'>
+                <td width='16%' v-for="(i,newindex) in item.monitoring_record.slice(0,9)" :key='newindex'>
                   <span  v-if="$store.getters.user.template_info.org_id != 10693">  <span :class="isRangeInSBP(i.monitor_systolic_blood_pressure_one.toString())">{{ i.monitor_systolic_blood_pressure_one.toString() }}</span>
                     /<span :class="isRangeInDBP(i.monitor_diastolic_blood_pressure_one.toString())">{{ i.monitor_diastolic_blood_pressure_one.toString() }}
                     </span>&nbsp;

src/store/modules/globalConfig.js

@@ -1032,9 +1032,9 @@ const global_config = {
         zongliang: 2,
         gaimingcheng: -1,
         gaijiliang: -1,
-        shouji_unit: 'mg',
-        weichi_unit: 'mg/h',
-        zongliang_unit: 'mg',
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },
@@ -1077,9 +1077,9 @@ const global_config = {
         zongliang: 2,
         gaimingcheng: -1,
         gaijiliang: -1,
-        shouji_unit: 'mg',
-        weichi_unit: 'mg/h',
-        zongliang_unit: 'mg',
+        shouji_unit: 'U',
+        weichi_unit: 'U/h',
+        zongliang_unit: 'U',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },

src/utils/login.js

@@ -0,0 +1,59 @@
+import axios from "axios";
+// import { Toast } from 'mint-ui'
+import { Toast } from "vant";
+const https = require('https');
+
+
+import context from '../../src/main.js'
+
+const agent = new https.Agent({
+  rejectUnauthorized: false  // 忽略证书验证
+});
+
+// create an axios instance
+const service = axios.create({
+  baseURL:"http://192.168.0.38:8080", // api的base_url
+  timeout: 30000, // request timeout
+  withCredentials: true,
+  httpsAgent: agent,
+});
+
+var self = this;
+// respone interceptor
+
+
+
+
+service.interceptors.response.use(
+  // response => response,
+  response => {
+    const res = response.data;
+    if (res.state !== 1) {
+       return response
+    } else {
+      return response;
+    }
+  },
+  error => {
+    if (error.message.includes("timeout")) {
+      // 判断请求异常信息中是否含有超时timeout字符串
+      return Promise.reject(error); // reject这个错误信息
+    }
+    return Promise.reject(error);
+  }
+);
+
+// service.interceptors.request.use(
+//   config => {
+//     // 登录流程控制中，根据本地是否存在token判断用户的登录情况
+//     // 但是即使token存在，也有可能token是过期的，所以在每次的请求头中携带token
+//     // 后台根据携带的token判断用户的登录情况，并返回给我们对应的状态码
+//     // 而后我们可以在响应拦截器中，根据状态码进行一些统一的操作。
+//     let token = localStorage.getItem('token');
+//     console.log("token=")
+//     console.log(token)
+//     token && (config.headers['KyToken'] = token);
+//     return config
+//   }
+// );
+export default service;