Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/api/dialysis.js

@@ -1,113 +1,114 @@
 import request from '@/utils/request'
 
-export function getDialysisScheduals (params) {
+export function getDialysisScheduals(params) {
   return request({
     url: '/m/api/scheduals',
     method: 'get',
-    params: params,
+    params: params
   })
 }
 
-export function getWaitingScheduals (params) {
+export function getWaitingScheduals(params) {
   return request({
     url: '/m/api/waiting_scheduals',
     method: 'get',
-    params: params,
+    params: params
   })
 }
 
-export function getDialysisRecord (params) {
+export function getDialysisRecord(params) {
   return request({
     url: '/m/api/dialysis/record',
     method: 'get',
-    params: params,
+    params: params
   })
 }
 
-export function dialysisGlobalConfig () {
+export function dialysisGlobalConfig() {
   return request({
     url: '/m/api/dialysisglobalconfig',
-    method: 'get',
+    method: 'get'
   })
 }
 
-export function commitTreatmentSummary (params) {
+export function commitTreatmentSummary(params) {
   return request({
     url: '/m/api/dialysis/treatmentSummary',
     method: 'post',
-    params: params,
+    params: params
 
   })
 }
 
-export function commitDoubleCheck (params) {
+export function commitDoubleCheck(params) {
   return request({
     url: '/m/api/dialysis/doublecheck',
     method: 'post',
-    params: params,
+    params: params
 
   })
 }
 
-export function commitAcceptsAssessment (params) {
+export function commitAcceptsAssessment(params) {
   return request({
     url: '/m/api/dialysis/acceptsAssessment',
     method: 'post',
-    params: params,
+    params: params
 
   })
 }
 
-export function finish (params) {
+export function finish(params) {
   return request({
     url: '/m/api/dialysis/finish',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-export function commitDialysisPrescription (params) {
+export function commitDialysisPrescription(params) {
   console.log(params)
   return request({
     url: '/m/api/dialysis/dialysisPrescription',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-export function commitAssessmentAfterDislysis (params) {
+export function commitAssessmentAfterDislysis(params) {
   return request({
     url: '/m/api/dialysis/assessmentAfterDislysis',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-export function addMonitorRecord (params) {
+export function addMonitorRecord(params) {
   return request({
     url: '/m/api/monitor/add',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-export function editMonitorRecord (params) {
+export function editMonitorRecord(params) {
+  console.log('params', params)
   return request({
     url: '/m/api/monitor/edit',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-export function deleteMonitorRecord (params) {
+export function deleteMonitorRecord(params) {
   return request({
     url: '/m/api/monitor/delete',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-export function GetAllZone (params) {
+export function GetAllZone(params) {
   return request({
     url: '/m/api/dialysis/allzone',
     method: 'get',
@@ -115,7 +116,7 @@ export function GetAllZone (params) {
   })
 }
 
-export function getSchedualPatient (params) {
+export function getSchedualPatient(params) {
   return request({
     url: '/m/api/dialysis/patients',
     method: 'get',
@@ -123,7 +124,7 @@ export function getSchedualPatient (params) {
   })
 }
 
-export function postSolution (params) {
+export function postSolution(params) {
   return request({
     url: '/m/api/solution',
     method: 'post',
@@ -131,7 +132,7 @@ export function postSolution (params) {
   })
 }
 
-export function startDialysis (params) {
+export function startDialysis(params) {
   return request({
     url: '/m/api/dialysis/start',
     method: 'post',
@@ -139,7 +140,7 @@ export function startDialysis (params) {
   })
 }
 
-export function getLastAccepts (params) {
+export function getLastAccepts(params) {
   return request({
     url: '/m/api/accepts/get',
     method: 'get',
@@ -147,7 +148,7 @@ export function getLastAccepts (params) {
   })
 }
 
-export function getPrintDialysisRecord (params) {
+export function getPrintDialysisRecord(params) {
   return request({
     url: '/m/api/print/dialysisorder',
     method: 'Get',
@@ -155,7 +156,7 @@ export function getPrintDialysisRecord (params) {
   })
 }
 
-export function getUrgentScheduleInitData (params) {
+export function getUrgentScheduleInitData(params) {
   return request({
     url: '/m/api/schedule/urgentinit',
     method: 'Get',
@@ -163,15 +164,15 @@ export function getUrgentScheduleInitData (params) {
   })
 }
 
-export function postUrgentSchedule (params) {
+export function postUrgentSchedule(params) {
   return request({
     url: '/m/api/schedule/urgentadd',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-export function postSign (params) {
+export function postSign(params) {
   return request({
     url: '/m/api/dialysis/sign',
     method: 'Post',
@@ -180,7 +181,7 @@ export function postSign (params) {
   })
 }
 
-export function GetMonitor (params) {
+export function GetMonitor(params) {
   return request({
     url: '/m/api/monitor/get',
     method: 'get',
@@ -188,7 +189,7 @@ export function GetMonitor (params) {
   })
 }
 
-export function GetMonitorToday (params) {
+export function GetMonitorToday(params) {
   return request({
     url: '/m/api/monitor/gettodaylast',
     method: 'get',
@@ -196,7 +197,7 @@ export function GetMonitorToday (params) {
   })
 }
 
-export function PostSearch (keyword) {
+export function PostSearch(keyword) {
   return request({
     url: '/m/api/patients/search?keyword=' + keyword,
     method: 'post'
@@ -204,64 +205,50 @@ export function PostSearch (keyword) {
   })
 }
 
-export function PostModifyStartDialysis (params) {
+export function PostModifyStartDialysis(params) {
   return request({
     url: '/m/api/startOrder/edit',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-export function PostModifyEndDialysis (params) {
+export function PostModifyEndDialysis(params) {
   return request({
     url: '/m/api/finishOrder/edit',
     method: 'post',
-    params: params,
+    params: params
   })
 }
 
-
-
-
-export function CreateGroupAdvice(id, groupno, advices){
+export function CreateGroupAdvice(id, groupno, advices) {
   return request({
-    url:'/m/api/advice_remind/create?id='+id + '&groupno=' + groupno,
-    method:'post',
-    data:advices,
+    url: '/m/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
+    method: 'post',
+    data: advices
   })
-
 }
 
-
-export function CreateDryWeight(params){
+export function CreateDryWeight(params) {
   return request({
-    url:"/m/api/dryweight/commit",
-    method:'post',
-    params:params,
+    url: '/m/api/dryweight/commit',
+    method: 'post',
+    params: params
   })
-
 }
 
-
-export function GetSolution(params){
+export function GetSolution(params) {
   return request({
-    url:"/m/api/solution/get",
-    method:'get',
-    params:params,
+    url: '/m/api/solution/get',
+    method: 'get',
+    params: params
   })
-
 }
 
-
-
-
-
-
-export function GetSchedualNumber(params){
+export function GetSchedualNumber(params) {
   return request({
-    url:"/m/api/schedule/get",
-    method:'get',
-    params:params,
+    url: '/m/api/schedule/get',
+    method: 'get',
+    params: params
   })
-
 }

src/pages/main/dialog/MonitDialog.vue

@@ -34,6 +34,7 @@
                 <th v-if="isShow('置换率') && template_id !=6" width="92px">置换率(L/h)</th>
                 <th v-if="isShow('置换量') && template_id ==6" width="50px">置换量(ml)</th>
                 <th v-if="isShow('置换量') && template_id !=6" width="50px">置换量(L)</th>
+                <th v-if="isShow('SpO₂')  && template_id !=6" width="50px">SpO₂(%)</th>
                 <th v-if="isShow('电导度')" width="50px">电导度(mS/m)</th>
                 <th v-if="isShow('置换液流量')" width="50px">置换液流量(ml/h)</th>
 
@@ -71,6 +72,9 @@
                 <td
                   v-if="isShow('置换量')"
                 >{{item.displacement_quantity?item.displacement_quantity:''}}</td>
+                 <td
+                  v-if="isShow('SpO₂')"
+                >{{item.blood_oxygen_saturation?item.blood_oxygen_saturation:''}}</td>
                 <td v-if="isShow('电导度')">{{item.conductivity?item.conductivity:''}}</td>
                 <td
                   v-if="isShow('置换液流量')"
@@ -278,6 +282,17 @@
                 v-model="form.displacement_quantity"
               />
             </div>
+            <div class="cell" v-if="isShow('SpO₂')">
+              <label v-if="template_id == 6">SpO₂(%)</label>
+              <label v-else>SpO₂(L)</label>
+              <input
+                type="number"
+                @focus="inputFocus"
+                onclick="this.select();"
+                class="inputBox"
+                v-model="form.blood_oxygen_saturation"
+              />
+            </div>
             <div class="cell" v-if="isShow('电导度')">
               <label>电导度(mS/m)</label>
               <input
@@ -474,7 +489,8 @@ export default {
         ktv: '', // KT/V(在线)
         symptom: '', // 症状
         dispose: '', // 处理
-        result: '', // 结果
+        result: '', // 结果,
+        blood_oxygen_saturation: '',
         monitoring_nurse: this.$store.getters.user.user.id // 监测人
       },
       doctor: this.$store.getters.user.user.user_name
@@ -553,7 +569,7 @@ export default {
         this.today_last_monitor_record = resp.monitor
 
         // this.form.operate_time = Date.parse(new Date())
-        this.form.operate_time = resp.monitor.operate_time  ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
+        this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
         this.form.pulse_frequency = '' // this.last_monitor_record.pulse_frequency;
         this.form.breathing_rated = resp.monitor.breathing_rate ? resp.monitor.breathing_rate : ''
         this.form.systolic_bp = '' // this.last_monitor_record.systolic_blood_pressure;
@@ -565,7 +581,7 @@ export default {
         this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate ? resp.monitor.ultrafiltration_rate : ''
         this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : ''
         this.form.sodium_concentration = resp.monitor.sodium_concentration ? resp.monitor.sodium_concentration : ''
-        this.form.dialysate_temperature = resp.monitor.dialysate_temperature  ? resp.monitor.dialysate_temperature : ''
+        this.form.dialysate_temperature = resp.monitor.dialysate_temperature ? resp.monitor.dialysate_temperature : ''
         this.form.temperature = resp.monitor.temperature ? resp.monitor.temperature : ''
         this.form.replacement_rate = resp.monitor.replacement_rate ? resp.monitor.replacement_rate : ''
         this.form.displacement_quantity = '' // this.last_monitor_record.displacement_quantity;
@@ -930,7 +946,7 @@ export default {
       } else {
         this.form.ktv = this.currentRow.ktv
       }
-
+      this.form.blood_oxygen_saturation = this.currentRow.blood_oxygen_saturation
       this.form.symptom = this.currentRow.symptom
       this.form.dispose = this.currentRow.dispose
       this.form.result = this.currentRow.result
@@ -998,7 +1014,7 @@ export default {
       params.result = this.form.result
       params.monitoring_nurse = this.form.monitoring_nurse
       params.displacement_flow_quantity = this.form.displacement_flow_quantity
-
+      params.blood_oxygen_saturation = this.form.blood_oxygen_saturation
       params.id = this.form.id
       editMonitorRecord(params).then(rs => {
         var resp = rs.data
@@ -1026,6 +1042,7 @@ export default {
           this.form.replacement_rate = ''
           this.form.displacement_quantity = ''
           this.form.ktv = ''
+          this.form.blood_oxygen_saturation = ''
           this.form.symptom = ''
           this.form.dispose = ''
           this.form.result = ''
@@ -1041,7 +1058,7 @@ export default {
           Toast.fail(resp.msg)
         }
       }).catch(error => {
-        Toast.fail("请求失败")
+        Toast.fail('请求失败')
       })
     },
     submitAction: function () {
@@ -1069,7 +1086,7 @@ export default {
       params.displacement_quantity = this.form.displacement_quantity
       params.conductivity = this.form.conductivity
       params.displacement_flow_quantity = this.form.displacement_flow_quantity
-
+      params.blood_oxygen_saturation = this.form.blood_oxygen_saturation
       params.ktv = this.form.ktv
       params.symptom = this.form.symptom
       params.dispose = this.form.dispose