Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/api/manage.js

@@ -709,3 +709,20 @@ export function DeleteImages(id, params) {
     params: params
   })
 }
+
+export function getUserMachTotalCount(params) {
+  return request({
+    url: '/api/manage/getusermachtotalcount',
+    method: 'get',
+    params: params
+  })
+}
+
+export function GetUserTotalCount(id, params) {
+  console.log('id====', id)
+  return request({
+    url: '/api/manage/getusertotalcount?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -291,6 +291,16 @@
           >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 23">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -483,6 +493,10 @@
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 22"
           ></DialysisPrintOrderTwentyTwo>
+          <DialysisPrintOrderTwentyThree
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 23"
+          ></DialysisPrintOrderTwentyThree>
         </div>
       </el-container>
     </div>
@@ -524,10 +538,12 @@ import DialysisPrintOrderNineteen from "./template/DialysisPrintOrderNineteen";
 import DialysisPrintOrderTwenty from "./template/DialysisPrintOrderTwenty";
 import DialysisPrintOrderTwentyOne from "./template/DialysisPrintOrderTwentyOne";
 import DialysisPrintOrderTwentyTwo from "./template/DialysisPrintOrderTwentyTwo";
+import DialysisPrintOrderTwentyThree from "./template/DialysisPrintOrderTwentyThree";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwentyThree,
     DialysisPrintOrderTwentyTwo,
     DialysisPrintOrderTwentyOne,
     DialysisPrintOrderTwenty,
@@ -870,6 +886,13 @@ export default {
           style: style2,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 23){
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       } 
     },
     printThisOnePage() {

src/xt_pages/management/components/UserForm.vue

@@ -139,7 +139,7 @@
             min-width="110px"
           >
             <template slot-scope="scope">
-              {{ getTimes(scope.row.disinfec_startime) }}
+              {{ getTimesTwo(scope.row.disinfec_startime) }}
             </template>
           </el-table-column>
           <el-table-column
@@ -148,7 +148,7 @@
             min-width="110px"
           >
             <template slot-scope="scope">{{
-              getTimes(scope.row.disinfec_endtime)
+              getTimesTwo(scope.row.disinfec_endtime)
             }}</template>
           </el-table-column>
           <el-table-column
@@ -1451,6 +1451,16 @@ export default {
       } else {
         return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       }
+    },
+     getTimesTwo(time) {
+      if (time < 0) {
+        return "";
+      }
+      if (time === 0) {
+        return "";
+      } else {
+        return uParseTime(time, "{y}-{m}-{d} {h}:{i}");
+      }
     },
     // 获取签名
     getAllOrganization() {
@@ -1466,15 +1476,18 @@ export default {
       EditUser(id, patientid).then(response => {
         if (response.data.state === 1) {
           var device = response.data.data.device;
-          //console.log("device", device);
           var patients = response.data.data.patients;
-          // console.log('patients', patients)
-          // eslint-disable-next-line no-sequences
-          (this.userform.id = device.id),
-            (this.userform.spling_date = uParseTime(
+          var count =  response.data.data.count
+          var macher =  response.data.data.macher
+           if(macher.user_total == ''){
+             macher.user_total = 0
+           }   
+          var totals = count[0].Total + parseInt(macher.user_total)
+          this.userform.id = device.id;
+          this.userform.spling_date = uParseTime(
               device.date,
               "{y}-{m}-{d}"
-            ));
+           );
           this.userform.patient_id = device.patient_id;
           this.userform.classtype = device.class;
           this.userform.zone = device.zone;
@@ -1490,7 +1503,7 @@ export default {
           this.userform.hyperfiltratio = device.hyperfiltratio;
           this.userform.weight_loss = device.weight_loss;
           this.userform.warning_value = device.warning_value;
-          this.userform.user_total = device.user_total;
+       
           this.userform.run = device.move;
 
           this.userform.failure_stage = device.failure_stage;
@@ -1506,6 +1519,7 @@ export default {
           this.userform.disinfection_residue = device.disinfection_residue;
           this.userform.longtime = device.long_time;
           this.userform.dialysis_time = device.dialysis_hour;
+          // this.userform.user_total = device.user_total
           // this.userform.starttime = uParseTime(
           //   device.disinfec_startime,
           //  '{y}-{m}-{d} {h}:{i}'
@@ -1554,6 +1568,7 @@ export default {
           if (device.disinfection === 0) {
             this.userform.disinfection = "";
           }
+          this.userform.user_total = totals.toString() 
         }
       });
     },
@@ -1978,13 +1993,10 @@ export default {
     getUserForm(id) {
       getUserForm(id, this.limit, this.page).then(response => {
         if (response.data.state === 1) {
-          var information = response.data.data.information;
-          //console.log("数据是-------", information);
-          // eslint-disable-next-line no-unused-vars
+          var information = response.data.data.information; 
+          console.log("information",information)
           var addmacher = response.data.data.addmacher;
-          // console.log('addmacher', addmacher)
-          // this.bed = addmacher.bed_number
-
+          console.log("addmacher",addmacher)
           for (let index = 0; index < information.length; index++) {
             if (information[index].class === 1) {
               information[index].class = "上午";
@@ -2086,7 +2098,7 @@ export default {
               information[index].disinfectant_type = "500mg/l含氯消毒剂";
             }
             if (information[index].disinfectant_type === 3) {
-              information[idnex].disinfectant_type = "1000mg/l含氯消毒剂";
+              information[index].disinfectant_type = "1000mg/l含氯消毒剂";
             }
             if (information[index].disinfectant_type === 4) {
               information[index].disinfectant_type = "1500mg/l含氯消毒剂";
@@ -2217,9 +2229,6 @@ export default {
             if (information[index].clean === 2) {
               information[index].clean = "";
             }
-
-            // this.form.zone = information[index].zone
-            // this.form.bed = information[index].bed_number
           }
           var total = response.data.data.total;
           console.log("total", total);
@@ -2232,7 +2241,6 @@ export default {
       getBedForm(id).then(response => {
         if (response.data.state === 1) {
           var addmacher = response.data.data.addmacher;
-          console.log("addmacher=============", addmacher);
           var number = response.data.data.number;
           console.log("number", number);
           //改动
@@ -2258,8 +2266,6 @@ export default {
       PostSearch(key).then(response => {
         if (response.data.state == 1) {
           searchArray = response.data.data.patient;
-          // console.log("ser=================",searchArray)
-
           cb(searchArray);
         }
       });
@@ -2350,7 +2356,6 @@ export default {
   },
   watch: {
     userdata(newvalue, oldvalue) {
-      console.log("newvalue是什么", newvalue);
       this.getUserForm(newvalue);
       this.getBedForm(newvalue);
       this.value = newvalue;

src/xt_pages/management/home.vue

@@ -2075,7 +2075,7 @@
   import { getAllSubregion, getAllMachine, getMachineDetailById,
     UpdateMachineInfo, getAllPlan, getAllPlanDetail, DeletePlans,
     getAllEquimentName, EditPlanDetail, UpdatePlanInfo, SaveInformation, getPatientInfo,
-    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getTimeBeteen, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode, selectChange, selectBed } from '@/api/manage'
+    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getTimeBeteen, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode, selectChange, selectBed,GetUserTotalCount } from '@/api/manage'
   import { uParseTime } from '@/utils/tools'
   import { getToken } from '@/api/qiniu'
   import PlanForm from './components/PlanForm'
@@ -2621,7 +2621,6 @@ export default {
             zone.push({ id: item.id, name: item.name })
           }
           var devicenumber = response.data.data.devicenumber
-          // console.log('devicenumber', devicenumber)
           this.bedZone = zone
 
           var zoness = [{ id: 0, name: '请选择' }]
@@ -2633,7 +2632,6 @@ export default {
           var bed = [{ id: 0, number: '请选择' }]
           for (let i = 0; i < numbers.length; i++) {
             const item = numbers[i]
-            // console.log(item)
             bed.push({ id: item.id, number: item.number })
           }
           this.bedNumberTwo = bed
@@ -2641,7 +2639,6 @@ export default {
           this.bedZoneThree = zoness
           this.bedNumber = numbers
 
-          // this.Number = devicenumber
         })
       },
 
@@ -2666,7 +2663,6 @@ export default {
         getAllMachine(this.forms.zone_id, this.forms.device_type).then(response => {
           if (response.data.state === 1) {
             var addmahcer = response.data.data.addmahcer
-            console.log('查找的数据', addmahcer)
             for(let j=0;j<addmahcer.length;j++){
               if(addmahcer[j].device_type == 1){
                  addmahcer[j].bed_number = addmahcer[j].number
@@ -2688,7 +2684,7 @@ export default {
               }
 
             }
-            // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
+            
           }
         })
       },
@@ -2697,7 +2693,6 @@ export default {
       },
       handleCurrentChange(val) {
         this.unitType = val.unit_type
-        // console.log('val是什么', val)
         this.currentRow = val
         this.$forceUpdate()
         this.getMachineDetailById(val.id)
@@ -2709,8 +2704,7 @@ export default {
         this.getUserRegister(val.id)
         // 病人下机后插入数据
         this.getAutoData(val.id)
-        this.getTotalNumber(val.id)
-        // this.getTimeWarning(val.id)
+        this.GetUserTotalCount(val.bed_id)
         this.getTimeBeteen(val.id)
         this.getData(val.bed_id)
       },
@@ -2725,35 +2719,17 @@ export default {
         getMachineDetailById(id).then(response => {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
-            console.log('设备详情', addmacher)
             var warning = response.data.data.warning
-            // console.log('warning', warning)
+          
             var time = this.getTimestamp(this.userform.date) - warning.stime
-            // console.log('时间', time)
-            // if (time < 2678400 && warning.dialysis_checked === 1) {
-            //   this.warnShow = false
-            // } else {
-            //   this.warnShow = true
-            // }
             var germ = response.data.data.germ
-            // console.log('germ', germ)
+          
             var timetwo = this.getTimestamp(this.userform.date) - germ.stime
-            // console.log('时间', timetwo)
-            // if (timetwo < 2678400 && germ.germ_checked === 1) {
-            //   this.warnShowTwo = false
-            // } else {
-            //   this.warnShowTwo = true
-            // }
+           
             var clean = response.data.data.clean
             var timethree = this.getTimestamp(this.userform.date) - clean.stime
-            // console.log('时间', timethree)
-            // if (timethree < 2678400 && clean.clean === 1) {
-            //   this.warnShowThree = false
-            // } else {
-            //   this.warnShowThree = true
-            // }
             var number = response.data.data.number
-            // console.log('number', number)
+          
             this.Number = number
             if (addmacher.device_type === 1) {
               this.sShow = false
@@ -2794,7 +2770,7 @@ export default {
             var zone = response.data.data.zone
 
             const arr1 = []
-            //  const cityOptions = ['HD', 'HDF', 'HD+HP', 'HP', 'HF', 'SCUF', 'IUF', 'HFHD+HP', 'HFR', 'HDF+HP', 'GRRT', '腹水回收']
+          
             for (let index = 0; index < mode.length; index++) {
               if (mode[index].treate_mode === 1) {
                 mode[index] = 'HD'
@@ -2883,7 +2859,7 @@ export default {
             this.form.machine_status = addmacher.machine_status
             this.form.user_total = addmacher.user_total
             this.form.remarks = addmacher.remarks
-            // this.form.device_mode = addmacher.device_mode
+           
             if (addmacher.rubbish_date !== 0) {
               this.form.rubbish_date = uParseTime(addmacher.rubbish_date, '{y}-{m}-{d}')
             }
@@ -2990,19 +2966,16 @@ export default {
         var bed_numberss = parseInt(bed_numbers)
         this.form.bed_number = bed_numberss
         this.$refs[formName].validate(valid => {
-          UpdateMachineInfo(this.form).then(response => {
-            // console.log('form', this.form)
+          UpdateMachineInfo(this.form).then(response => {         
             if (response.data.state === 1) {
-              var addmacher = response.data.data.addmacher
-              // console.log('addmacher----', addmacher)
-              this.$message.success('修改成功')
-              // this.$router.push({ path: '/device/home?index=' + this.tabIndex })
+              var addmacher = response.data.data.addmacher         
+              this.$message.success('修改成功')           
               for (let i = 0; i < this.tableDatatwo.length; i++) {
                 if (this.tableDatatwo[i].id == addmacher.id) {
                   for (let j = 0; j < this.deviceMode.length; j++) {
                     if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
                       addmacher.device_mode = this.deviceMode[j].device_mode
-                      //   this.$forceUpdate()
+                    
                     }
                   }
 
@@ -3174,7 +3147,7 @@ export default {
         getAllPlan().then(response => {
           if (response.data.state === 1) {
             var plan = response.data.data.plan
-
+            console.log("plan=====",plan )
             for (let index = 0; index < plan.length; index++) {
               if (plan[index].time === 1) {
                 plan[index].time = '周一'
@@ -3233,7 +3206,7 @@ export default {
               if (plan[index].machine_disinfectant === 2) {
                 plan[index].machine_disinfectant = '500mg/l含氯消毒剂'
               }
-              if (plan[index].machine_disinfectantant === 3) {
+              if (plan[index].machine_disinfectant === 3) {
                 plan[index].machine_disinfectant = '1000mg/l含氯消毒剂'
               }
               if (plan[index].machine_disinfectant === 4) {
@@ -3308,7 +3281,7 @@ export default {
         getAllPlanDetail(unit_type).then(response => {
           if (response.data.state === 1) {
             var plandetail = response.data.data.plandetail
-            // console.log('plandetail', plandetail)
+            console.log("plandetail",plandetail)
             for (let index = 0; index < plandetail.length; index++) {
               if (plandetail[index].time === 1) {
                 plandetail[index].time = '周一'
@@ -3367,7 +3340,7 @@ export default {
               if (plandetail[index].machine_disinfectant === 2) {
                 plandetail[index].machine_disinfectant = '500mg/l含氯消毒剂'
               }
-              if (plandetail[index].machine_disinfectantant === 3) {
+              if (plandetail[index].machine_disinfectant === 3) {
                 plandetail[index].machine_disinfectant = '1000mg/l含氯消毒剂'
               }
               if (plandetail[index].machine_disinfectant === 4) {
@@ -3665,15 +3638,11 @@ export default {
             }
             this.userform.date = uParseTime(patients.schedule_date, '{y}-{m}-{d}')
             this.userform.patient_name = patients.name
-            this.userform.patient_id = patients.patient_id
-            // this.userform.patient_name = patients.name
+            this.userform.patient_id = patients.patient_id 
             var zone = response.data.data.zone
-            // console.log('zone==========', zone)
             this.userform.zone = zone.id
             var number = response.data.data.number
-            // console.log('nubmer', number)
             this.userform.bed_number = number.id
-            // this.userform.bed_number = number.number
             var order = response.data.data.order
             this.userform.start_time = uParseTime(order.start_time, '{y}-{m}-{d} {h}:{i}')
             this.userform.end_time = uParseTime(order.end_time, '{y}-{m}-{d} {h}:{i}')
@@ -3811,8 +3780,7 @@ export default {
         if (this.userform.user_total === '0') {
           this.userform.user_total = 0
         }
-        // console.log('上机时间', this.userform.start_time)
-        // console.log('下机时间', this.userform.end_time)
+       
         this.$refs[formName].validate((valid) => {
           if (valid) {
             SaveInformation(this.equimentid, this.userform).then(response => {
@@ -3867,7 +3835,6 @@ export default {
         getAllOrganization().then(response => {
           if (response.data.state === 1) {
             var approle = response.data.data.approle
-            // console.log('approle签名',approle)
             this.autograph = approle
             this.sampling = approle
           }
@@ -3877,11 +3844,7 @@ export default {
         getUserRegister(id).then(response => {
           if (response.data.state === 1) {
             var information = response.data.data.information
-             console.log('产讯使用登记', information)
-            // eslint-disable-next-line no-unused-vars
             var role = response.data.data.role
-            // console.log('role', role)
-            // eslint-disable-next-line eqeqeq
             var dislysis = response.data.data.dislysis
 
             this.userform.id = information.id
@@ -3899,12 +3862,8 @@ export default {
             this.userform.contagion = information.contagion
             this.userform.dialysis_mode = information.dialysis_mode
             this.userform.start_time = this.updateTimes(information.start_time)
-            // this.userform.start_time = uParseTime(information.start_time, '{y}-{m}-{d} {h}:{i}')
             this.userform.end_time = this.updateTimes(information.end_time)
             // this.userform.end_time = uParseTime(information.end_time, '{y}-{m}-{d} {h}:{i}')
-            // this.userform.dialysis_time = information.dialysis_hour
-            // this.userform.hyperfiltratio = information.hyperfiltratio
-            // this.userform.weight_loss = information.weight_loss
             if (information.hyperfiltratio === '') {
               this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
             } else {
@@ -3915,15 +3874,12 @@ export default {
             } else {
               this.userform.dialysis_time = information.dialysis_hour
             }
-            // this.userform.dialysis_time = dislysis.actual_treatment_hour + 'h' + dislysis.actual_treatment_minute + 'min'
-            // this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
             if (information.weight_loss === '') {
               this.userform.weight_loss = dislysis.weight_loss
             } else {
               this.userform.weight_loss = information.weight_loss
             }
 
-            // this.userform.weight_loss = dislysis.weight_loss
             this.userform.warning_value = information.warning_value
             this.userform.user_total = information.user_total
             if (information.move === 0) {
@@ -3944,8 +3900,6 @@ export default {
             this.userform.longtime = information.long_time
             this.userform.starttime = this.updateTimes(information.disinfec_startime)
             this.userform.endtime = this.updateTimes(information.disinfec_endtime)
-            // this.userform.starttime = uParseTime(information.disinfec_startime, '{y}-{m}-{d} {h}:{i}')
-            // this.userform.endtime = uParseTime(information.disinfec_endtime, '{y}-{m}-{d} {h}:{i}')
 
             if (information.dialysis_checked === 1) {
               this.userform.dialysis_checked = true
@@ -4097,7 +4051,6 @@ export default {
             SaveQualityControl(this.equimentid, this.qualityFormThree).then(response => {
               if (response.data.state === 1) {
                 var ion = response.data.data.ion
-                // console.log('ion', ion)
                 this.$message.success('保存成功')
                 this.$refs.child.getAllQulityInfo()
                 this.qualityFormThree.samplerc = ''
@@ -4187,11 +4140,9 @@ export default {
         return new Promise((resolve, reject) => {
           getToken().then(response => {
             const token = response.data.data.uptoken
-            console.log('token', token)
             _self._data.uploadFileData.token = token
             _self._data.uploadFileData.key = key
             resolve(true)
-          // eslint-disable-next-line handle-callback-err
           }).catch(err => {
             reject(false)
           })
@@ -4199,7 +4150,6 @@ export default {
       },
       handleSuccess(res, file, fileList) {
         this.guaForm.images = this.qiniuDomain + res.url
-        console.log('图片路径', this.guaForm.images)
         this.$refs.upload.clearFiles()
         this.filename = file.name
         this.guaForm.imageName = file.name
@@ -4244,7 +4194,6 @@ export default {
             SaveRepair(this.equimentid, this.guaForm).then(response => {
               if (response.data.state === 1) {
                 var repair = response.data.data.repair
-                // console.log('reqair', repair)
                 this.$message.success('保存成功')
                 this.$refs.child.getAllRepair()
                 this.guaForm.start_time = ''
@@ -4276,8 +4225,6 @@ export default {
         PostSearch(key).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.patient
-            // console.log("ser",searchArray)
-
             cb(searchArray)
           }
         })
@@ -4297,7 +4244,6 @@ export default {
           // eslint-disable-next-line eqeqeq
           if (response.data.state == 1) {
             var patient = response.data.data.patient
-            // console.log('patient', patient)
             // eslint-disable-next-line no-undef
             if (patient.is_infectious === 0) {
               this.userform.contagion = ''
@@ -4348,28 +4294,15 @@ export default {
           if (response.data.state === 1) {
             var information = response.data.data.information
             var time = this.getTimestamp(this.userform.date) - information.stime
-            // console.log('时间', time)
-            // if (time < 2678400) {
-            //   this.warnShow = false
-            // }
             var deviceInformation = response.data.data.deviceInformation
-
             var timetwo = this.getTimestamp(this.userform.date) - deviceInformation.stime
-            // if (timetwo < 2678400) {
-            //  this.warnShowTwo = false
-            // }
-
             var clean = response.data.data.clean
-            // var timethree = this.getTimestamp(this.userform.date) - clean.stime
-            // if (timethree < 2678400) {
-            //  this.warnShowThree = false
-            // }
+          
           }
         })
       },
       getTimeBeteen(id) {
         var todayTime = moment(new Date()).format('YYYY-MM-DD')
-        // console.log('todayTime', todayTime)
         getTimeBeteen(id, todayTime).then(response => {
           if (response.data.state === 1) {
             var timedata = response.data.data.timeData
@@ -4380,7 +4313,6 @@ export default {
               this.warnShow = false
             }
             var todayTimeTwo = response.data.data.timeDataTwo
-            // console.log('todayTimeTwo', todayTimeTwo)
             if (todayTimeTwo.length === 0) {
               this.warnShowTwo = true
             }
@@ -4389,7 +4321,6 @@ export default {
             }
 
             var timeDataThree = response.data.data.timeDataThree
-            //console.log('timeDataThree', timeDataThree)
             if (timeDataThree.length === 0) {
               this.warnShowThree = true
             }
@@ -4441,7 +4372,6 @@ export default {
             this.$forceUpdate()
             this.userform.bed_number = zone.id
             this.userform.zone = zone.zone_id
-            // console.log('zone', zone)
           }
         })
       },
@@ -4461,15 +4391,27 @@ export default {
           this.guaForm.images = ''
           this.classShow = false
         })
-      }
+      },
+
+      //获取机器的使用次数
+       GetUserTotalCount(bedid){
+          this.userform.user_total = ""
+         GetUserTotalCount(bedid).then(response=>{
+            if(response.data.state == 1){
+              var count =  response.data.data.count
+              var addmacher = response.data.data.addmacher 
+              if(addmacher.user_total == ''){
+                  addmacher.user_total = 0
+              }   
+              this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
+            }
+         })
+       }
     },
     created() {
       this.getAllSubregion()
       this.getAllMachine()
-      var index = this.$route.query.index
       var bedid = this.$route.query.bedid
-      // var id = this.$route.query.id
-      // this.equimentid = id
       this.bedid = bedid
       this.getAllPlan()
       this.getAllEquimentName()
@@ -4478,6 +4420,9 @@ export default {
       this.getAllEquitType()
       this.getAllpatient()
       this.getAllMode()
+      this.GetUserTotalCount(bedid)
+      
+
   }
   }
 </script>

src/xt_pages/management/index.vue

@@ -126,7 +126,7 @@
         </el-table-column>
 
         <el-table-column label="使用次数" align="center">
-          <template slot-scope="scope">{{ scope.row.user_total }}</template>
+          <template slot-scope="scope">{{getTotal(scope.row.bed_id,scope.row.user_total) }}</template>
         </el-table-column>
 
         <el-table-column label="操作" width="120" align="center">
@@ -162,7 +162,7 @@
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-import { getAllMachineInfo, getAllSubregion } from "@/api/manage";
+import { getAllMachineInfo, getAllSubregion,getUserMachTotalCount } from "@/api/manage";
 import ManageForm from "./components/ManageForm";
 
 export default {
@@ -205,7 +205,8 @@ export default {
         equipmentid: "",
         statusid: ""
       },
-      total: 0
+      total: 0,
+      count:[],
     };
   },
   methods: {
@@ -313,12 +314,35 @@ export default {
           id
       });
       // this.$router.push({ path: '/device/home?index=' + index + '&' + 'id=' + id })
+    },
+    getUserMachTotalCount(){
+        getUserMachTotalCount().then(response=>{
+           if(response.data.state == 1){
+             var count = response.data.data.count
+             console.log("count",count)
+             this.count = count
+           }
+        })
+    },
+    getTotal(id,usertotal){
+       if(usertotal == ''){
+           usertotal = 0
+       }
+       var count = 0
+       for(let i=0;i<this.count.length;i++){
+          if(id == this.count[i].bed_number){  
+            count = parseInt(this.count[i].Total)+parseInt(usertotal)        
+          }
+       }
+      //  console.log("count",count)
+       return count
     }
   },
   created() {
     // 获取所有的分区
     this.getAllSubregion();
     this.getAllMachineInfo();
+    this.getUserMachTotalCount()
   }
 };
 </script>

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -96,9 +96,12 @@
       </div>
       <div class="cell clearfix newDisplay">
          <span v-for="(item,index) in normData" :key="index" class="index">
-           {{item.item_name}}
-           <span v-if="item.range_type == 1">({{item.min_range}}-{{item.large_range}})</span>
-           <span v-if="item.range_type == 2">({{item.range_value}})</span>
+           <span v-if="item.is_status == 1">{{item.item_name}}</span> 
+           <span v-if="item.is_status == 0 && item.inspection_major == 0  && item.inspection_minor == -1">收缩压</span>
+            <span v-if="item.is_status == 0 && item.inspection_major == 0  && item.inspection_minor == -2">舒张压</span>
+           <span v-if="item.range_type == 1 && item.is_status == 1">({{item.min_range}}-{{item.large_range}})</span>
+           <span v-if="item.range_type == 2 && item.is_status == 1">({{item.range_value}})</span>
+          <span v-if="item.range_type == 0 && item.is_status == 0">({{item.min_range}}-{{item.large_range}})</span>
         </span> 
       </div>
     </div>
@@ -126,6 +129,8 @@ export default {
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
       },  
+      sortOne:0,
+      sortTwo:0,
       modetype:0,
       startime:"",
       endtime:"",
@@ -140,6 +145,7 @@ export default {
         { path: false, name: "按时间分组" }
       ],
       normData:[],
+      newArrData:[],
       listQuery: {
         start_time: "",
         end_time: "",
@@ -292,7 +298,11 @@ export default {
             zoomLock: true // 锁定区域禁止缩放
           }
         ]
-      }
+      },
+      syslarge:0,
+      sysmin:0,
+      dialarge:0,
+      diamin:0,
     };
   },
   methods: {
@@ -345,17 +355,21 @@ export default {
       this.listQuery.state = state;
     },
     chooseType(val) {
+       this.modesData.series = []
+       this.modesData.xAxis = []
       this.type = val;
-      if(val == "按月份统计对比"){
-         this.modetype = 0
-        
+      if(val == "按月份统计对比"){ 
+         this.modetype = 1
+         this.monthType = 0
+         this.getlist() 
       }
        if(val == "按季度统计对比"){
-         this.modetype = 1
-         
+         this.modetype = 0
+         this.getlist()
       }
       if(val == "自定义"){
         this.modetype = 2
+        
       }
      
     },
@@ -481,9 +495,34 @@ export default {
     getNormData(){
       getNormData().then(response=>{
          if(response.data.state === 1){
+           var newArr = []
            var normdata = response.data.data.normdata
+           newArr  = normdata
           //  console.log("指标正常范围",normdata)
-           this.normData = normdata
+           var bloodpressure = response.data.data.bloodPressure
+          console.log("bloodPressure",bloodpressure)
+           for(let i=0;i<bloodpressure.length;i++){
+              if(bloodpressure[i].inspection_major == 0 && bloodpressure[i].inspection_minor == -1 && bloodpressure[i].is_status == 0){
+                 bloodpressure[i].item_name = "收缩压"
+                 this.sortOne = bloodpressure[i].sort
+                 this.syslarge = parseInt(bloodpressure[i].large_range)
+                 this.sysmin = parseInt(bloodpressure[i].min_range)
+              }
+               if(bloodpressure[i].inspection_major == 0 && bloodpressure[i].inspection_minor == -2 && bloodpressure[i].is_status == 0){
+                 bloodpressure[i].item_name = "舒张压"
+                 this.sortTwo = bloodpressure[i].sort
+                 this.dialarge = parseInt(bloodpressure[i].large_range)
+                 this.diamin = parseInt(bloodpressure[i].min_range)
+              }
+           }
+
+          //  console.log("血压数据",bloodpressure)
+           bloodpressure.map(item=>{
+             newArr.push(item)
+           })
+           var newarr  =  newArr.sort((a,b)=>{ return a.sort-b.sort})
+          // console.log("normdata",newarr)
+           this.normData = newarr
            this.getlist()
          }
       })
@@ -595,25 +634,82 @@ export default {
       getFirstQuarter(params).then(response=>{
          if(response.data.state === 1){
             var count =  response.data.data.count
-          //  console.log("count",count) 
+    
             var countwo = response.data.data.countwo 
-          //  console.log("countwo",countwo)
+           
+            var systolicTotal =  response.data.data.systolicTotal
+            console.log("systolictotal",systolicTotal)
+            var sysstandTotal = 0
+            var systolic = response.data.data.systolic
+           console.log("systolic",systolic)
+            var sysarr = []
+            for(let i=0;i<systolic.length;i++){
+              if(systolic[i].systolic_blood_pressure >= this.sysmin && systolic[i].systolic_blood_pressure<=this.syslarge){
+                  sysarr.push(systolic[i])
+              }
+            } 
+            sysstandTotal = sysarr.length
+           console.log("sysarr",sysarr)
+
+            var diastotal =  response.data.data.diastotal
+            var diasstandtotal = 0
+          
+            var diastolic = response.data.data.diastolic
+            // console.log("diastolic",diastolic)
+            var diaArr=[]
+            for(let i=0;i<diastolic.length;i++){
+             if(diastolic[i].diastolic_blood_pressure>=this.diamin && diastolic[i].diastolic_blood_pressure<=this.dialarge){
+                  diaArr.push(diastolic[i])
+             }
+            }
+            // console.log("diaArr",diaArr)
+            diasstandtotal = diaArr.length
+            var normData = response.data.data.normData
+          
+            var newArr = [
+              {item_id:0,Total:0,Count:0,sort:0},
+              {item_id:0,Total:0,Count:0,sort:0}
+            ]
+     
+            for(let i=0;i<newArr.length;i++){
+               if(sysstandTotal == 0){
+                  newArr[0].Total = 1
+                  newArr[0].Count = sysstandTotal
+                  newArr[0].sort = this.sortOne
+
+               }else{
+                newArr[0].Total = systolicTotal
+                newArr[0].Count = sysstandTotal
+                newArr[0].sort = this.sortOne
+               }
+               if(diasstandtotal == 0){
+                  newArr[1].Total = 1
+                  newArr[1].Count = diasstandtotal
+                  newArr[1].sort = this.sortTwo
+               }else{
+                newArr[1].Total = diastotal
+                newArr[1].Count = diasstandtotal
+                newArr[1].sort = this.sortTwo
+               }
+            }
+ 
             countwo.map(item=>{
               count.push(item)
             })
-          //  console.log("count",count)
+         
             //获取已经配置的数据 
             var arr=[]
             for(let i=0;i<count.length;i++){  
-               for(let j=0;j<this.normData.length;j++){
-                if(count[i].item_id == this.normData[j].inspection_minor){
+               for(let j=0;j<normData.length;j++){
+                if(count[i].item_id == normData[j].inspection_minor){
                      arr.push(count[i])
                 }
               }
             }
-          //  console.log("arr",arr )
+      
+           
+            var arrtwo =  this.arrayDate(count,normData)
            
-            var arrtwo =  this.arrayDate(count,this.normData)
             for(let i=0;i<arrtwo.length;i++){
                 this.$set(arrtwo[i], 'Count', 0)
               }
@@ -623,12 +719,13 @@ export default {
             arrtwo.map(item => {
               arr.push(item)
             })
-            // console.log("arr",arr)
-             arr.sort(this.compare('sort'))  
-            // arr.sort((a,b)=>{
-            //     return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);
-            //   });
-            // console.log("arr",arr)
+          
+            newArr.map(item=>{
+              arr.push(item)
+            }) 
+            arr.sort(this.compare('sort'))  
+            
+
             for(const key in this.normData ){
                this.modesData.xAxis.push(this.normData[key].item_name);
                 if(key in arr){
@@ -640,7 +737,6 @@ export default {
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
             this.getArrLength(this.chart.xAxis.data)
-            // console.log('====',this.modesData) 
           
          }
       })
@@ -654,7 +750,7 @@ export default {
     },
     arrayDate(array1,array2){
         var array1 = array1;
-        var array2 = this.normData;
+        var array2 = array2;
         var result = [];
         for(var i = 0; i < array2.length; i++){
             var obj = array2[i];

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -102,8 +102,12 @@
                   @click="clickQuality(index,item.inspection_minor)"
                 >
                   <p>{{ item.item_name }}</p>
-                   <span v-if="isTrue == 1"><i class="iconfont icon-gou gou"></i></span>
-                   <span v-if="isTrue == 0"><i class="iconfont icon-gantanhao gth"></i></span>
+                   <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)!=0"><span v-if="parseInt(item.min_range)<=getvlist(item.inspection_minor) && getvlist(item.inspection_minor)<=parseInt(item.large_range) "><i class="iconfont icon-gou gou"></i></span></span>
+                   <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)!=0"><span v-if="parseInt(item.min_range)>getvlist(item.inspection_minor) || getvlist(item.inspection_minor)>parseInt(item.large_range)"><i class="iconfont icon-gantanhao gth"></i></span></span> 
+                   <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)==0"></span>
+                   <span v-if="item.range_type == 2 && getvlistwo(item.inspection_minor)!=''"><span v-if="getvlistwo(item.inspection_minor)==item.range_value"><i class="iconfont icon-gou gou"></i></span></span>
+                   <span v-if="item.range_type == 2 && getvlistwo(item.inspection_minor)!=''"><span v-if="getvlistwo(item.inspection_minor)!=item.range_value"><i class="iconfont icon-gantanhao gth"></i></span></span>
+                   <span v-if="item.range_type == 2 && getvlistwo(item.inspection_minor)==''"></span>
                 </div>
               </div>
             </div>
@@ -133,7 +137,7 @@ import LineChart from "../qcd/components/LineChart";
 import LineChart1 from '../qcd/components/LineChart1'
 import { uParseTime } from "@/utils/tools";
  import { PostSearch} from '@/api/patient'
-import { getCurrentOrgPatients,GetQualityControl,getNormData,getPatientComplianceDetail } from "@/api/common/common"
+import { getCurrentOrgPatients,GetQualityControl,getNormData,getPatientComplianceDetail,getIdSlist } from "@/api/common/common"
 export default {
   components: {
     LineChart,
@@ -418,7 +422,9 @@ export default {
       },
       inspect_date:0,
       monthActive:0,
-      otherData:[]
+      otherData:[],
+      vlist:[],
+      ids:[],
     };
   },
   methods: {
@@ -441,6 +447,7 @@ export default {
         var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
         this.endtime =Date.parse(monthEndDate)/1000-1;//s
          this.getlistDetail()
+         this.getIdSlist()
       }
 
       //近三月
@@ -457,6 +464,7 @@ export default {
         this.endtime = Date.parse(endDate)/1000
     
         this.getlistDetail()
+         this.getIdSlist()
       }
     
 
@@ -471,6 +479,7 @@ export default {
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         this.endtime = Date.parse(endDate)/1000
         this.getlistDetail()
+         this.getIdSlist()
       }
 
       //近一年
@@ -483,6 +492,7 @@ export default {
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         this.endtime = Date.parse(endDate)/1000
         this.getlistDetail()
+         this.getIdSlist()
       }
 
 
@@ -549,6 +559,7 @@ export default {
      this.patientid = val.id
      this.patient_name = val.name
       this.getlistDetail()
+      this.getIdSlist()
     },
    getCurrentOrgPatients(){
       getCurrentOrgPatients().then(response=>{
@@ -567,13 +578,16 @@ export default {
     getNormData(){
       getNormData().then(response=>{
          var normdata = response.data.data.normdata
-         console.log("normdata",normdata)
+        //  console.log("normdata",normdata)
           for(let i=0;i<normdata.length;i++){
             this.item_id = normdata[0].inspection_minor
             this.itemName = normdata[0].item_name + "("+normdata[0].min_range + "-"+normdata[0].large_range +")"+normdata[0].unit
+            this.ids.push(normdata[i].inspection_minor)
           }
+          // console.log("ids",this.ids)
           this.normData = normdata
           this.getlist()
+          this.getIdSlist()
       })
     },
     getlist(){
@@ -603,7 +617,7 @@ export default {
        GetQualityControl(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("list是什么",list)
+            // console.log("list是什么",list)
             for(let i=0;i<list.length;i++){
               if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
                     this.isTrue = 1  
@@ -665,7 +679,7 @@ export default {
             endtime:this.endtime,
             itemid:this.item_id,
           }
-        console.log("params",params)
+        // console.log("params",params)
        getPatientComplianceDetail(params).then(response=>{
             if(response.data.state == 1){
               var list =  response.data.data.list
@@ -722,7 +736,7 @@ export default {
         })
       },
      handleSelect(val) {
-        console.log("val",val)
+        // console.log("val",val)
         this.listQuery.search = val.name
         this.patientid = val.id
         for(let i=0;i<this.patientsData.length;i++){
@@ -751,6 +765,46 @@ export default {
           }
         }
 
+      },
+      getIdSlist(){
+          var ids = []
+          ids = this.ids
+          this.vlist = []
+        getIdSlist({ids:ids},this.patientid).then(response=>{
+          if(response.data.state == 1){
+            const vlist =  response.data.data.vlist
+            console.log("vlist",vlist)
+            this.vlist = vlist
+          }
+        })
+      },
+      getvlist(id){
+        var itemvalue = 0
+        for(let i=0;i<this.vlist.length;i++){
+          if(id == this.vlist[i].item_id){
+             if(this.vlist[i].inspect_type == 1 &&this.vlist[i].inspect_value!=''){
+               itemvalue = parseInt(this.vlist[i].inspect_value)
+             }else{
+               itemvalue = 0
+             }
+             
+          }
+        }
+        return itemvalue
+      },
+      getvlistwo(id){
+        var itemvalue = ''
+        for(let i=0;i<this.vlist.length;i++){
+           if(id == this.vlist[i].item_id){
+              if(this.vlist[i].inspect_type ==2 && this.vlist[i].inspect_value!=''){
+                itemvalue = this.vlist[i].inspect_value
+              }else{
+                itemvalue = ''
+              }
+              
+            }
+        }
+        return itemvalue
       }
   },
 

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -16,31 +16,52 @@
       <div class="configTable">
         <el-table :data="configuraData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column prop="date" label="检验检查大项" width="180">
-              <template slot-scope="scope">{{ scope.row.project_name }}</template>
+              <template slot-scope="scope">
+                <span v-if="scope.row.is_status == 1">{{ scope.row.project_name }}</span> 
+                <span v-if="scope.row.is_status == 0 && scope.row.inspection_major == 0">血压</span> 
+              </template>
           </el-table-column>
           <el-table-column prop="name" label="检查小项" width="300">
-             <template slot-scope="scope">{{ scope.row.item_name }}</template>
+             <template slot-scope="scope">
+               <span v-if="scope.row.is_status == 1">{{ scope.row.item_name }}</span>
+               <span v-if="scope.row.is_status == 0 && scope.row.inspection_minor == -1">收缩压</span>
+               <span v-if="scope.row.is_status == 0 && scope.row.inspection_minor == -2">舒张压</span>
+             </template>
           </el-table-column>
           <el-table-column prop="address" label="范围">
              <template slot-scope="scope">
-               <span v-if="scope.row.range_type == 1">
+               <span v-if="scope.row.range_type == 1 && scope.row.is_status == 1">
                  {{ scope.row.min_range }} - {{scope.row.large_range}}
                 </span>
-                <span v-if="scope.row.range_type == 2">
+                <span v-if="scope.row.range_type == 2 && scope.row.is_status == 1 ">
                    {{scope.row.range_value}}
                 </span>
+                <span v-if="scope.row.is_status == 0">{{ scope.row.min_range }} - {{scope.row.large_range}}</span>
              </template>
           </el-table-column>
            <el-table-column prop="address" label="单位">
-              <template slot-scope="scope">{{ scope.row.unit }}</template>
+              <template slot-scope="scope">
+                <span v-if="scope.row.is_status == 1">
+                    {{ scope.row.unit }}
+                </span>
+                <span v-if="scope.row.is_status == 0">
+                   mmHg
+                </span>
+              </template>
             </el-table-column>
             <el-table-column prop="address" label="排序">
                 <template slot-scope="scope">{{ scope.row.sort }}</template>
             </el-table-column>
           <el-table-column label="操作" width="180">
             <template slot-scope="scope">
-              <el-button size="mini" type="primary" @click="handleEdit(scope.row.id)">编辑</el-button>
-              <el-button size="mini" type="danger" @click="handleDelete(scope.row.id,scope.$index)">删除</el-button>
+              <span v-if="scope.row.is_status ==1">
+                <el-button size="mini" type="primary" @click="handleEdit(scope.row.id)">编辑</el-button>
+                <el-button size="mini" type="danger" @click="handleDelete(scope.row.id,scope.$index)">删除</el-button>
+              </span>
+              <span v-if="scope.row.is_status == 0">
+                 <el-button size="mini" type="primary" @click="handleEditTwo(scope.row.id)">编辑</el-button>
+                 <el-button size="mini" type="danger" :disabled ="true">删除</el-button>
+              </span>
             </template>
           </el-table-column>
         </el-table>
@@ -48,8 +69,8 @@
           <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :page-sizes="[10, 20, 30, 100]"
-              :page-size="10"
+              :page-sizes="[12, 20, 30, 100]"
+              :page-size="12"
               background
               style="margin-top:20px;float: right"
               layout="total, sizes, prev, pager, next, jumper"
@@ -176,6 +197,34 @@
           <el-button type="primary" @click="EditConfiguration('editform')">保 存</el-button>
         </div>
       </el-dialog>
+
+
+      <el-dialog title="编辑" :visible.sync="editDialogtwo">
+        <el-form :model="editform" ref="editform" :rules="rules">
+          <el-form-item label="检查大项:" :label-width="formLabelWidth" required prop="inspectionMajor">
+              <el-input v-model="editform.inspectionMajor" style="width:200px" :disabled="true"></el-input>
+          </el-form-item>
+          <el-form-item label="检查小项:" :label-width="formLabelWidth" required prop="inspectionMinor">
+             <el-input v-model="editform.inspectionMinor" style="width:200px" :disabled="true"></el-input>
+          </el-form-item>
+          <div style="display:flex;">
+            <el-form-item label="质控范围:" :label-width="formLabelWidth" required prop="min_range">
+                <el-input style="width:200px" v-model="editform.min_range"></el-input>
+            </el-form-item>
+            <span style="margin-top:10px">-</span>
+            <el-form-item class='newFormItem' :label-width="formLabelWidth" required prop="large_range">
+                <el-input style="width:200px" v-model="editform.large_range"></el-input>
+            </el-form-item>
+          </div>
+          <el-form-item label="排序:" :label-width="formLabelWidth">
+            <el-input style="width:200px" v-model="editform.sort"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="editDialogtwo = false">取 消</el-button>
+          <el-button type="primary" @click="EditBloodPrussre('editform')">保 存</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -187,7 +236,7 @@ import { GetOICData } from "@/api/qcd";
 import PieChart from "../qcd/components/BarChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveConfiguration,getConfigurationList,getConfigurationDetail,getAllInspectionMinor,UpdateConfiguration,DeleteConfiguration,getLastSort }from "@/api/common/common";
+import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveConfiguration,getConfigurationList,getConfigurationDetail,getAllInspectionMinor,UpdateConfiguration,DeleteConfiguration,getLastSort,getBloodPressureDetail,UpdateBloodPrussre }from "@/api/common/common";
 export default {
   name: "dialysisTotal",
   data() {
@@ -208,6 +257,7 @@ export default {
       configuraData: [],
       newDialog: false,
       editDialog: false,
+      editDialogtwo:false,
       formLabelWidth: "120px",
       form: {
         inspectionMajor: "",
@@ -256,9 +306,9 @@ export default {
       getConfigurationDetail(id).then(response=>{
          if(response.data.state == 1){
            var configurationdetail = response.data.data.configurationdetail
-           console.log("详情",configurationdetail)
+ 
            var id = response.data.data.vid
-           console.log("id",id)
+      
            if (id == 0) {
               this.editform.inspectionMinor = configurationdetail.inspection_minor
            }else{
@@ -291,13 +341,35 @@ export default {
          }
       })
     },
+
+    handleEditTwo(id){
+       this.editDialogtwo = true
+       getBloodPressureDetail(id).then(response=>{
+          if(response.data.state == 1){
+            var blooddetail =   response.data.data.blooddetail
+            if(blooddetail.inspection_major == 0){
+              this.editform.inspectionMajor = "血压"
+            }
+            if(blooddetail.inspection_minor == -1){
+              this.editform.inspectionMinor  = "收缩压"
+            }
+            if(blooddetail.inspection_minor == -2){
+              this.editform.inspectionMinor  = "舒张压"
+            }
+            this.editform.id = blooddetail.id
+            this.editform.large_range = blooddetail.large_range
+            this.editform.min_range = blooddetail.min_range
+            this.editform.sort = blooddetail.sort
+          }
+       })
+    },
     
     //获取大项数据来源
     getInspectionMajor(){
       getInspectionMajor().then(response=>{
         if(response.data.state == 1){
           var inspection =  response.data.data.inspection
-           console.log("大项是什么",inspection)
+
           this.InspectionMajor = inspection
          
         }
@@ -309,7 +381,6 @@ export default {
       getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-          // console.log("小项",inspection)
          this.InspectionMinor = inspection
         }
       })
@@ -320,7 +391,7 @@ export default {
        getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-        // console.log("小项",inspection)
+  
          this.InspectionMinorTwo = inspection
         }
       })
@@ -330,7 +401,7 @@ export default {
        getInspectionRange(id).then(response=>{
          if(response.data.state == 1){
            var inspectionRange =  response.data.data.inspectionRange
-          //  console.log("inspectionRange",inspectionRange)
+      
            if(inspectionRange.range_type == 1){
              this.showOne = true
              this.showTwo = false
@@ -394,16 +465,27 @@ export default {
       getConfigurationList(this.limit,this.page).then(response=>{
         if(response.data.state === 1){
           var configurationlist = response.data.data.configurationlist
+          // console.log("configurationlist",configurationlist)
+          if(this.page == 1){
+             var pressure = response.data.data.pressure
+            //  console.log("pressure",pressure)
+             pressure.map(item=>{
+             configurationlist.push(item)
+            })
+          }
+        
           for(let i=0;i<configurationlist.length;i++){
             if(configurationlist[i].sort === 0){
               configurationlist[i].sort = ""
             }
           }
-          console.log("列表",configurationlist)
+
+          var newarr  =   configurationlist.sort((a,b)=>{ return a.sort-b.sort})
+          // console.log("排序",newarr)
           this.configuraData = configurationlist
           var total = response.data.data.total
-         // console.log("total",total)
-          this.total = total
+          // console.log("total",total)
+          this.total = total+2
         }
       })
     },
@@ -485,6 +567,36 @@ export default {
          this.form.range_value = ""
          this.editform.range_value = ""
       }
+    },
+    EditBloodPrussre(formName){
+       if(this.editform.sort == ""){
+         this.editform.sort = 0
+       }
+       if(this.editform.sort!=""){
+        var sorts =  this.editform.sort
+        var sort = parseInt(sorts)
+        this.editform.sort = sort
+       }
+      if(this.editform.inspectionMajor == "血压"){
+            this.editform.inspectionMajor = 0
+        }
+      if(this.editform.inspectionMinor == "收缩压"){
+            this.editform.inspectionMinor = -1
+        }
+      if(this.editform.inspectionMinor == "舒张压"){
+           this.editform.inspectionMinor = -2
+        }
+
+       this.$refs[formName].validate(valid=>{
+          UpdateBloodPrussre(this.editform.id,this.editform).then(response=>{
+             if(response.data.state == 1){
+              var standard =  response.data.data.standard
+              this.editDialogtwo = false
+              this.getConfigurationList()
+              this.$message.success("修改成功")
+             }
+          })
+       })
     }
   },
   components: {