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

src/api/qcd.js

@@ -261,3 +261,35 @@ export function Getdialysistreatdetail(params) {
     params: params
   })
 }
+// 体重分析趋势
+export function Getpatinetweight(params) {
+  return request({
+    url: '/api/commonqc/patinet/weight',
+    method: 'get',
+    params: params
+  })
+}
+// 体重分析详情
+export function Getweightdetail(params) {
+  return request({
+    url: '/api/commonqc/weight/detail',
+    method: 'get',
+    params: params
+  })
+}
+// 血压趋势/api/commonqc/patinet/bp
+export function Getpatinetbp(params) {
+  return request({
+    url: '/api/commonqc/patinet/bp',
+    method: 'get',
+    params: params
+  })
+}
+// 血压分析详情
+export function Getbpdetail(params) {
+  return request({
+    url: '/api/commonqc/bp/detail',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/Dialysisanalysis.js

@@ -32,15 +32,15 @@ export default {
         noCache: true
       }
     },
-    // {//体重血压质控
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/index'),
-    //   name: 'weightblood',
-    //   meta: {
-    //     title: '体重血压分析',
-    //     noCache: true
-    //   }
-    // },
+    {//体重血压质控
+      path: '/Dialysisanalysis/qualitycontrol/weightblood',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/index'),
+      name: 'weightblood',
+      meta: {
+        title: '体重血压分析',
+        noCache: true
+      }
+    },
 
     {//透析总量分析
       path: '/Dialysisanalysis/qualitycontrol/new_otherIndicators/Total_analysis',
@@ -99,94 +99,94 @@ export default {
     },
 
     // 体重血压
-    // {//干体重分析
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood/dry_weight',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/dry_weight'),
-    //   name: 'dry_weight',
-    //   meta: {
-    //     title: '患者干体重分析',
-    //     noCache: true
-    //   },
-    //   hidden: true,
-    //   is_menu: false
-    // },
-    // {//上次透析分母
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood/list_denominator',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/list_denominator'),
-    //   name: 'list_denominator',
-    //   meta: {
-    //     title: '患者体重增长分析(以上次透后体重为分母)',
-    //     noCache: true
-    //   },
-    //   hidden: true,
-    //   is_menu: false
-    // },
-    // {//干体重分母
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood/dry_denominator',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/dry_denominator'),
-    //   name: 'dry_denominator',
-    //   meta: {
-    //     title: '患者体重增长分析(以干体重为分母)',
-    //     noCache: true
-    //   },
-    //   hidden: true,
-    //   is_menu: false
-    // },
-    // {//患者透后体重分析
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood/dialyze_after',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/dialyze_after'),
-    //   name: 'dialyze_after',
-    //   meta: {
-    //     title: '患者透后体重分析',
-    //     noCache: true
-    //   },
-    //   hidden: true,
-    //   is_menu: false
-    // },
-    // {//患者体重详情
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood/weight_table',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/weight_table'),
-    //   name: 'weight_table',
-    //   meta: {
-    //     title: '患者体重详情',
-    //     noCache: true
-    //   },
-    //   hidden: true,
-    //   is_menu: false
-    // },
-    // {//透前血压分析
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood/before_Blood',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/before_Blood'),
-    //   name: 'before_Blood',
-    //   meta: {
-    //     title: '透前血压分析',
-    //     noCache: true
-    //   },
-    //   hidden: true,
-    //   is_menu: false
-    // },
-    // {//透前血压分析
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood/after_Blood',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/after_Blood'),
-    //   name: 'after_Blood',
-    //   meta: {
-    //     title: '透后血压分析',
-    //     noCache: true
-    //   },
-    //   hidden: true,
-    //   is_menu: false
-    // },
-    // {//患者血压详情
-    //   path: '/Dialysisanalysis/qualitycontrol/weightblood/blood_table',
-    //   component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/blood_table'),
-    //   name: 'blood_table',
-    //   meta: {
-    //     title: '透后血压分析',
-    //     noCache: true
-    //   },
-    //   hidden: true,
-    //   is_menu: false
-    // },
+    {//干体重分析
+      path: '/Dialysisanalysis/qualitycontrol/weightblood/dry_weight',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/dry_weight'),
+      name: 'dry_weight',
+      meta: {
+        title: '患者干体重分析',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {//上次透析分母
+      path: '/Dialysisanalysis/qualitycontrol/weightblood/list_denominator',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/list_denominator'),
+      name: 'list_denominator',
+      meta: {
+        title: '患者体重增长分析(以上次透后体重为分母)',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {//干体重分母
+      path: '/Dialysisanalysis/qualitycontrol/weightblood/dry_denominator',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/dry_denominator'),
+      name: 'dry_denominator',
+      meta: {
+        title: '患者体重增长分析(以干体重为分母)',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {//患者透后体重分析
+      path: '/Dialysisanalysis/qualitycontrol/weightblood/dialyze_after',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/dialyze_after'),
+      name: 'dialyze_after',
+      meta: {
+        title: '患者透后体重分析',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {//患者体重详情
+      path: '/Dialysisanalysis/qualitycontrol/weightblood/weight_table',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/weight_table'),
+      name: 'weight_table',
+      meta: {
+        title: '患者体重详情',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {//透前血压分析
+      path: '/Dialysisanalysis/qualitycontrol/weightblood/before_Blood',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/before_Blood'),
+      name: 'before_Blood',
+      meta: {
+        title: '透前血压分析',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {//透前血压分析
+      path: '/Dialysisanalysis/qualitycontrol/weightblood/after_Blood',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/after_Blood'),
+      name: 'after_Blood',
+      meta: {
+        title: '透后血压分析',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {//患者血压详情
+      path: '/Dialysisanalysis/qualitycontrol/weightblood/blood_table',
+      component: () => import('@/xt_pages/Dialysisanalysis/weightblood/components/blood_table'),
+      name: 'blood_table',
+      meta: {
+        title: '透后血压分析',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
 
 
 

src/xt_pages/Dialysisanalysis/weightblood/components/after_Blood.vue

@@ -154,7 +154,7 @@
                 width="">
               </el-table-column>
               <el-table-column
-                prop="dialysis_date"
+                prop="PostDialysisBP"
                 label="透后血压"
                 width="">
               </el-table-column>
@@ -184,7 +184,7 @@
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getdialysistreatfinish,Getdialysistreatdetail} from '../../../../api/qcd'
+import {Getpatinetbp,Getbpdetail} from '../../../../api/qcd'
 import {getAllNurseList} from '@/api/fallassement'
 import { getAllDoctorList} from "@/api/device"
 import html2canvas from "html2canvas"
@@ -205,24 +205,14 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        // status_options:[],
         nurseList:[],
         operators:[],
         docList:[],
-        status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
-        // status_options:[{value:1,label:'待定卧床'},{value:2,label:'<40KG'},{value:3,label:'40-50KG'},
-        //                 {value:4,label:'50-60KG'},{value:5,label:'<60-70KG'},{value:6,label:'>70KG'}
-        //                 ],
+        status_options:[],
+
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
-        mode_options:[{ id: 1, name: 'HD' },{ id: 2, name: 'HDF' },{ id: 3, name: 'HD + HP' },{ id: 4, name: 'HP' },
-          { id: 5, name: 'HF' },{ id: 6, name: 'SCUF' },{ id: 7, name: 'IUF' },{ id: 8, name: 'HFHD' },{ id: 9, name: 'HFHD+HP' },
-          { id: 10, name: 'PHF' },{ id: 11, name: 'HFR' },{ id: 12, name: 'HDF+HP' },{ id: 13, name: 'CRRT' },{ id: 14, name: '腹水回输' },
-          { id: 15, name: 'HD前置换' },{ id: 16, name: 'HD后置换' },{ id: 17, name: 'HDF前置换' },{ id: 18, name: 'HDF后置换' },
-          { id:19, name:"IUF+HD"},{ id:20, name:"UF"},{ id:21, name:"HD+"},{ id:22, name:"血浆胆红素吸附+HDF"},{ id:23, name:"血浆胆红素吸附"},
-          { id:24, name:"I-HDF"},{ id:25, name:"HD高通"},{ id:26, name:"CVVH"},{ id:27, name:"CVVHD"},{ id:28, name:"CVVHDF"},{ id:29, name:"PE"},
-        ],
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
         status_id:"",
@@ -238,34 +228,33 @@ import html2canvas from "html2canvas"
         var chartDom = document.getElementById('mychart')
         var myChart = echarts.init(chartDom);
         const params={
-          start_date:this.start_date,
-          end_date:this.end_date
+          start_time:this.start_date,
+          end_time:this.end_date,
+          statistics_type:1
         }
-        Getdialysistreatfinish(params).then(response =>{
+        Getpatinetbp(params).then(response =>{
           if(response.data.state ==1){
-            const list = response.data.data.data
+            const list = response.data.data.list
             const xAxis = []
             const yAxis = []
-
-            const total = response.data.data.total
+            var option = []
+            var total =0
             for(let key in list){
               const obj={
-                name:key,
-                value:list[key]
+                name:list[key].name,
+                value:list[key].total
               }
               xAxis.push(obj)
-              yAxis.push(key)
+              yAxis.push(list[key].name)
+              total = total + list[key].total
+              const obj2 ={
+                value:(key*1)+1,
+                label:list[key].name
+              }
+              option.push(obj2)
             }
-            const status = []
-            // for(let i in yAxis){
-            //   const obj ={
-            //     value:(i*1)+1,
-            //     label:yAxis[i]
-            //   }
-            //   status.push(obj)
-            // }
-            // this.status_options = status
-            console.log('this.status_options',this.status_options);
+            this.status_options = option
+            console.log('this.status_options',response.data.data);
             const option = {
                 title:{
                   text:'总数'+total,
@@ -327,13 +316,13 @@ import html2canvas from "html2canvas"
             myChart.on('click',params =>{
               this.complete_dialog = true
               console.log('bbbb',params);
-              var status_id =''
+
               for(let i in this.status_options){
                 if(params.data.name == this.status_options[i].label){
-                  status_id = this.status_options[i].value
+                  this.status_value = this.status_options[i].value
                 }
               }
-              this.getdetail(status_id)
+              this.getdetail(this.status_value)
             })
           }
         })
@@ -376,7 +365,7 @@ import html2canvas from "html2canvas"
       // 导出excel
       derive_click(){
         let tableData = [
-          ['序号', '透析号', '患者姓名', '年龄','透析日期', '处方透析时长', '实际透析时长', '实际差(min)', '主治医生', '主治护士']//导出表头
+          ['序号', '透析号', '患者姓名', '年龄','透析日期', '透后血压']//导出表头
         ]
         this.tableData.forEach((item,index) =>{
           let rowdata=[]
@@ -386,53 +375,48 @@ import html2canvas from "html2canvas"
             item.patient_name,
             item.age,
             item.dialysis_date,
-            item.dialysis_duration,
-            item.actual_duration,
-            item.diff,
-            item.doctor,
-            item.nurse,
+            item.PostDialysisBP
+
           ]
           tableData.push(rowdata)
         })
         let workSheet = XLSX.utils.aoa_to_sheet(tableData);
         let bookNew = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(bookNew, workSheet, '透析治疗完成率') // 工作簿名称
-        let name = '透析治疗完成率'+ '.xlsx'
+        XLSX.utils.book_append_sheet(bookNew, workSheet, '患者透后血压分析') // 工作簿名称
+        let name = '患者透后血压分析'+ '.xlsx'
         XLSX.writeFile(bookNew, name) // 保存的文件名
       },
       // 详情数据源
-      getdetail(mode){
+      getdetail(value){
         const params ={
-          start_date:this.start_date,
-          end_date:this.end_date,
-          mode:mode,
+          start_time:this.start_date,
+          end_time:this.end_date,
+          status_type:value,
           page:this.currentPage,
           limit:this.limit,
         }
-        Getdialysistreatdetail(params).then(response =>{
-          if(response.data.state){
+        Getbpdetail(params).then(response =>{
+          if(response.data.state ==1){
             const list = response.data.data.list
             const xAxis = []
             const table = []
-            list.forEach((item,index) =>{
-              const obj={
-                index:index+1,
-                dialysis_no:item.dialysis_no,
-                patient_name:item.patient_name,
-                age:this.analyzeIDCard(item.id_card_no),
-                dialysis_date:item.dialysis_date.split('T')[0],
-                dialysis_duration:item.dialysis_duration,
-                actual_duration:item.actual_duration,
-                diff:item.diff,
-                doctor:this.getdoctor(item.doctor),
-                nurse:this.getnurse(item.nurse)
-              }
-              table.push(obj)
-            })
-            this.tableData = table
-            this.total = response.data.data.total
+            if(list.length > 0){
+              list.forEach((item,index) =>{
+                const obj={
+                  index:index+1,
+                  dialysis_no:item.dialysis_no,
+                  patient_name:item.patient_name,
+                  age:item.age,
+                  dialysis_date:this.getTime(item.assessment_date),
+                  PostDialysisBP:item.post_dialysis_bp,
+                }
+                table.push(obj)
+              })
+              this.tableData = table
+              this.total = response.data.data.total
+            }
           }
-          console.log('55555',response);
+          console.log('55555透后',response);
         })
       },
       // 选择日期

src/xt_pages/Dialysisanalysis/weightblood/components/before_Blood.vue

@@ -154,7 +154,7 @@
                 width="">
               </el-table-column>
               <el-table-column
-                prop="dialysis_date"
+                prop="PreDialysisBP"
                 label="透前血压"
                 width="">
               </el-table-column>
@@ -184,8 +184,8 @@
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getdialysistreatfinish,Getdialysistreatdetail} from '../../../../api/qcd'
-import {getAllNurseList} from '@/api/fallassement'
+import {Getpatinetbp,Getbpdetail} from '../../../../api/qcd'
+// import {getAllNurseList} from '@/api/fallassement'
 import { getAllDoctorList} from "@/api/device"
 import html2canvas from "html2canvas"
   export default {
@@ -238,34 +238,33 @@ import html2canvas from "html2canvas"
         var chartDom = document.getElementById('mychart')
         var myChart = echarts.init(chartDom);
         const params={
-          start_date:this.start_date,
-          end_date:this.end_date
+          start_time:this.start_date,
+          end_time:this.end_date,
+          statistics_type:1
         }
-        Getdialysistreatfinish(params).then(response =>{
+        Getpatinetbp(params).then(response =>{
           if(response.data.state ==1){
-            const list = response.data.data.data
+            const list = response.data.data.list
             const xAxis = []
             const yAxis = []
-
-            const total = response.data.data.total
+            var option = []
+            var total =0
             for(let key in list){
               const obj={
-                name:key,
-                value:list[key]
+                name:list[key].name,
+                value:list[key].total
               }
               xAxis.push(obj)
-              yAxis.push(key)
+              yAxis.push(list[key].name)
+              total = total + list[key].total
+              const obj2 ={
+                value:(key*1)+1,
+                label:list[key].name
+              }
+              option.push(obj2)
             }
-            const status = []
-            // for(let i in yAxis){
-            //   const obj ={
-            //     value:(i*1)+1,
-            //     label:yAxis[i]
-            //   }
-            //   status.push(obj)
-            // }
-            // this.status_options = status
-            console.log('this.status_options',this.status_options);
+            this.status_options = option
+            console.log('this.status_options血1压1',response.data.data);
             const option = {
                 title:{
                   text:'总数'+total,
@@ -327,13 +326,12 @@ import html2canvas from "html2canvas"
             myChart.on('click',params =>{
               this.complete_dialog = true
               console.log('bbbb',params);
-              var status_id =''
               for(let i in this.status_options){
                 if(params.data.name == this.status_options[i].label){
-                  status_id = this.status_options[i].value
+                  this.status_value = this.status_options[i].value
                 }
               }
-              this.getdetail(status_id)
+              this.getdetail(this.status_value)
             })
           }
         })
@@ -376,7 +374,7 @@ import html2canvas from "html2canvas"
       // 导出excel
       derive_click(){
         let tableData = [
-          ['序号', '透析号', '患者姓名', '年龄','透析日期', '处方透析时长', '实际透析时长', '实际差(min)', '主治医生', '主治护士']//导出表头
+          ['序号', '透析号', '患者姓名', '年龄','透析日期', '透前血压']//导出表头
         ]
         this.tableData.forEach((item,index) =>{
           let rowdata=[]
@@ -386,51 +384,47 @@ import html2canvas from "html2canvas"
             item.patient_name,
             item.age,
             item.dialysis_date,
-            item.dialysis_duration,
-            item.actual_duration,
-            item.diff,
-            item.doctor,
-            item.nurse,
+            item.PreDialysisBP
           ]
           tableData.push(rowdata)
         })
         let workSheet = XLSX.utils.aoa_to_sheet(tableData);
         let bookNew = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(bookNew, workSheet, '透析治疗完成率') // 工作簿名称
-        let name = '透析治疗完成率'+ '.xlsx'
+        XLSX.utils.book_append_sheet(bookNew, workSheet, '患者透前血压分析') // 工作簿名称
+        let name = '患者透前血压分析'+ '.xlsx'
         XLSX.writeFile(bookNew, name) // 保存的文件名
       },
       // 详情数据源
-      getdetail(mode){
+      getdetail(blood){
         const params ={
-          start_date:this.start_date,
-          end_date:this.end_date,
-          mode:mode,
+          start_time:this.start_date,
+          end_time:this.end_date,
+          status_type:blood,
           page:this.currentPage,
           limit:this.limit,
         }
-        Getdialysistreatdetail(params).then(response =>{
+        Getbpdetail(params).then(response =>{
+          console.log('Getbpdetail血压',response.data);
           if(response.data.state){
             const list = response.data.data.list
             const xAxis = []
             const table = []
-            list.forEach((item,index) =>{
-              const obj={
-                index:index+1,
-                dialysis_no:item.dialysis_no,
-                patient_name:item.patient_name,
-                age:this.analyzeIDCard(item.id_card_no),
-                dialysis_date:item.dialysis_date.split('T')[0],
-                dialysis_duration:item.dialysis_duration,
-                actual_duration:item.actual_duration,
-                diff:item.diff,
-                doctor:this.getdoctor(item.doctor),
-                nurse:this.getnurse(item.nurse)
-              }
-              table.push(obj)
-            })
-            this.tableData = table
-            this.total = response.data.data.total
+            if(list.length >0){
+              list.forEach((item,index) =>{
+                const obj={
+                  index:index+1,
+                  dialysis_no:item.dialysis_no,
+                  patient_name:item.patient_name,
+                  age:item.age,
+                  dialysis_date:this.getTime(item.assessment_date),
+                  PreDialysisBP:item.pre_dialysis_bp,
+
+                }
+                table.push(obj)
+              })
+              this.tableData = table
+              this.total = response.data.data.total
+            }
           }
           console.log('55555',response);
         })
@@ -665,26 +659,26 @@ import html2canvas from "html2canvas"
 
       },
       // 护士
-      getAllNurseList(){
-        getAllNurseList().then(response=>{
-           if(response.data.state ==1){
-             var nurseList  = response.data.data.nurseList
-            console.log('0000',nurseList);
-             this.nurseList =nurseList
-           }
-        })
-      },
+      // getAllNurseList(){
+      //   getAllNurseList().then(response=>{
+      //      if(response.data.state ==1){
+      //        var nurseList  = response.data.data.nurseList
+      //       console.log('0000',nurseList);
+      //        this.nurseList =nurseList
+      //      }
+      //   })
+      // },
       // 医生
-      getAllDoctorList(){
-        getAllDoctorList().then(response=>{
-          if(response.data.state == 1){
-              var list = response.data.data.list
-              console.log("list222222",list)
-              this.docList = list
-              this.operators = response.data.data.operators
-          }
-        })
-      },
+      // getAllDoctorList(){
+      //   getAllDoctorList().then(response=>{
+      //     if(response.data.state == 1){
+      //         var list = response.data.data.list
+      //         console.log("list222222",list)
+      //         this.docList = list
+      //         this.operators = response.data.data.operators
+      //     }
+      //   })
+      // },
       getnurse(ids){
         const nurse = this.nurseList
         for(let i in nurse){
@@ -704,11 +698,13 @@ import html2canvas from "html2canvas"
     },
     mounted(){
       this.getecharts()
+      // this.getdetail()
     },
     created(){
       this.start_date = this.getFirstDayOfMonth(new Date())
-      this.getAllNurseList()
-      this.getAllDoctorList()
+      // this.getAllNurseList()
+      // this.getAllDoctorList()
+      // this.getdetail()
     },
 
   }

src/xt_pages/Dialysisanalysis/weightblood/components/blood_table.vue

@@ -41,18 +41,18 @@
               </el-date-picker>
             </div>
             <div>
-              体重增长:
-              <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+              状态:
+              <el-select v-model="status_value" placeholder="请选择" style="width: 100px;">
                 <el-option :key="0" label="不限" :value="0"></el-option>
                 <el-option
-                  v-for="item in dialyze_options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                  v-for="item in status_options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
                 </el-option>
               </el-select>
             </div>
-            
+
           </div>
           <div style="flex: 1;">
             <div>
@@ -69,62 +69,66 @@
           <el-table-column
             prop="index"
             label="序号"
-            width="">
+            width="50">
           </el-table-column>
           <el-table-column
             prop="dialysis_no"
             label="透析号"
-            width="">
+            width="70">
           </el-table-column>
           <el-table-column
-            prop="name"
-            label="患者姓名">
+            prop="patient_name"
+            label="患者姓名"
+            width="80">
           </el-table-column>
           <el-table-column
-            prop="name"
+            prop="gender"
             label="性别"
-            width="">
+            width="50">
           </el-table-column>
           <el-table-column
-            prop="name"
+            prop="age"
             label="年龄"
-            width="">
+            width="50">
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="dialysis_date"
             label="透析日期"
-            width="">
+            width="100">
           </el-table-column>
           <el-table-column
-            prop="mode_name"
+            prop="dryweight"
             label="干体重"
-            width="">
+            width="70">
           </el-table-column>
           <el-table-column
-            prop="dialyszers"
-            label="超滤总量(L)">
+            prop="UltrafiltrationVol"
+            label="超滤总量(L)"
+            width="90">
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="actual_ultrafiltration"
             label="实际超滤量(ml)"
-            width="">
+            width="100">
           </el-table-column>
           <el-table-column
-            prop="mode_name"
-            label="超滤滤"
-            width="">
+            prop="ultrafiltration_rate"
+            label="超滤率"
+            width="70">
           </el-table-column>
           <el-table-column
-            prop="dialyszers"
-            label="透前血压">
+            prop="preDialysisBP"
+            label="透前血压"
+            width="90">
           </el-table-column>
           <el-table-column
-            prop="dialyszers"
+            prop="monitoringbp"
             label="监测记录血压">
           </el-table-column>
           <el-table-column
-            prop="dialyszers"
-            label="透后血压">
+            prop="PostDialysisBP"
+            label="透后血压"
+            width="90">
           </el-table-column>
         </el-table>
         <div style="text-align: right;margin-top: 10px;">
@@ -142,14 +146,14 @@
     </div>
 
     <!-- 弹窗 -->
-   
+
   </div>
 </template>
 <script>
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getdialyzer,Getdialyzerdetail,Getdialyzerconfig} from '../../../../api/qcd'
+import {Getbpdetail} from '../../../../api/qcd'
 import { forEach } from 'jszip';
 import html2canvas from "html2canvas"
   export default {
@@ -169,18 +173,12 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        dialyze_options:[],
+        status_value:1,
+        status_options:[{value:1,label:'达标'},{value:2,label:'不达标'}],
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
-        modearr:[{ id: 1, name: 'HD' },{ id: 2, name: 'HDF' },{ id: 3, name: 'HD + HP' },{ id: 4, name: 'HP' },
-          { id: 5, name: 'HF' },{ id: 6, name: 'SCUF' },{ id: 7, name: 'IUF' },{ id: 8, name: 'HFHD' },{ id: 9, name: 'HFHD+HP' },
-          { id: 10, name: 'PHF' },{ id: 11, name: 'HFR' },{ id: 12, name: 'HDF+HP' },{ id: 13, name: 'CRRT' },{ id: 14, name: '腹水回输' },
-          { id:19, name:"IUF+HD"},{ id:20, name:"UF"},{ id:21, name:"HD+"},{ id:22, name:"血浆胆红素吸附+HDF"},{ id:23, name:"血浆胆红素吸附"},
-          { id:24, name:"I-HDF"},{ id:25, name:"HD高通"},{ id:26, name:"CVVH"},{ id:27, name:"CVVHD"},{ id:28, name:"CVVHDF"},{ id:29, name:"PE"},
-          { id:30, name:"血浆胆红素吸附+HP"},{ id:31, name:"HPD"},{ id:32, name:"HDP"},{ id:33, name:"HFD"},{ id:34, name:"HDF100"},
-          { id:35, name:"HDF600"},{ id:36, name:"HDF800"},{ id:37, name:"HDF1000"},
-        ],
+
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
@@ -193,157 +191,41 @@ import html2canvas from "html2canvas"
       return_click(){
         this.$router.push('/Dialysisanalysis/qualitycontrol/weightblood')
       },
-      // 数据源
-      getecharts(){
-        var chartDom = document.getElementById('mychart')
-        var myChart = echarts.init(chartDom);
-        const params ={
-          start_date:this.start_date,
-          end_date:this.end_date,
-        }
-        Getdialyzer(params).then(response =>{
-          console.log('ressponse',response.data.data);
-          if(response.data.state ==1){
-            console.log('bbbbbbbbb',response.data.data);
-            const list = response.data.data.data
-            const xAxis =[]
-            const yAxis = []
-            list.forEach(item =>{
-
-              xAxis.push(item.name)
-              yAxis.push(item.count)
-            })
-            this.bar_xAxis = xAxis
-            const options = []
-            for(let i in xAxis){
-              const arr ={
-                id:i+1,
-                name:xAxis[i]
-              }
-              options.push(arr)
-            }
-            this.dialyze_options = options
-            const option = {
-              xAxis: {
-                type: 'category',
-                data: xAxis,
-                axisLabel:{
-                  interval:0,
-                }
-              },
-              yAxis: {
-                type: 'value'
-              },
-              series: [
-                {
-                  data:yAxis ,
-                  type: 'bar',
-                  barWidth: '25%',
-                  label: {
-                    normal: {
-                      show: true,
-                      position: 'top',
-                      formatter: '{c}',
-                      textStyle:{
-                        color: 'black',//字体颜色
-                        fontSize: 13//字体大小
-                      }
-                    },
-                  },
-                  itemStyle:{
-                    normal:{
-                      color:function (params){
-                        // const colorarr=['#FFA333','#A155E8','#6D91FF','#A233A2'];
-                        var colorarr = [["#A9E0F3", "#9FBDFC"],["#FFD7C0", "#FF9994"]]
-                        var index = params.dataIndex;
-                        if (params.dataIndex >= colorarr.length) {
-                          index = params.dataIndex % colorarr.length;
-                        }
-                        return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                          { offset: 0, color: colorarr[index][0] },
-                          // { offset: 0.5, color: colorList[index][1] },
-                          { offset: 1, color: colorarr[index][1] }
-                        ]);
-                      }
-                    }
-                  }
-                }
-              ]
-            }
-            myChart.setOption(option);
-            myChart.on('click',params =>{
-              this.dialyze_dialog = true
-              console.log('vvvvv',params);
-              this.Getdialyzerdetail(params.name)
-            })
-          }
-
-        })
-
-      },
       // 导出excel
       exportExcel(){
         let tableData = [
-          ['序号', '透析号', '患者姓名', '透析日期','透析模式', '透析器']//导出表头
+          ['序号', '透析号', '患者姓名','性别','年龄', '透析日期','干体重', '超滤总量','实际超滤量','超滤率','透前血压','监测记录血压','透后血压']//导出表头
         ]
         this.tableData.forEach((item,index) =>{
           let rowdata=[]
           rowdata=[
             item.index,
             item.dialysis_no,
-            item.name,
-            item.date,
-            item.mode_name,
-            item.dialyszers,
+            item.patient_name,
+            item.gender,
+            item.age,
+            item.dialysis_date,
+            item.dryweight,
+            item.UltrafiltrationVol,
+            item.actual_ultrafiltration,
+            item.ultrafiltration_rate,
+            item.preDialysisBP,
+            item.monitoringbp,
+            item.PostDialysisBP,
           ]
           tableData.push(rowdata)
         })
         let workSheet = XLSX.utils.aoa_to_sheet(tableData);
         let bookNew = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(bookNew, workSheet, '透析器使用统计') // 工作簿名称
-        let name = '透析器使用统计'+ '.xlsx'
+        XLSX.utils.book_append_sheet(bookNew, workSheet, '患者血压详情') // 工作簿名称
+        let name = '患者血压详情'+ '.xlsx'
         XLSX.writeFile(bookNew, name) // 保存的文件名
       },
-      // 查询
-      sete_click(){
-        this.getecharts()
-      },
       // 详情查询
       deil_click(){
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        this.Getdialyzerdetail(this.status_value)
       },
-       // 下载
-      Download_click(){
-        const options ={
-          allowTaint: true,
-          useCORS: true
-        }
-        html2canvas(this.$refs.mychart,options).then(canvas =>{
-          // const imageSrc = canvas.toDataURL();
-          const imageUrl = canvas.toDataURL("image/png");
-          // console.log('5555',imageUrl);
-        //   // const base = this.url.split(',')[1]
-        //   // console.log('2222',base);
-          const blob = this.dataURLtoBlob(imageUrl)
-          // console.log('4444',blob);
-          const url = URL.createObjectURL(blob);
-          // const file = (this.url).blob();
-          // console.log('1111',url);
-          var link= document.createElement("a");
-        //   //将生成的图片url赋值给a标签的href属性
-          link.href = url;
-        //   //设置下载的文件名
-          link.download = "透析器使用统计.jpg";
-          // // 将a标签插入dom中
-          console.log('link',link);
-          document.body.appendChild(link);
-          //模拟点击事件触发下载
-          link.click();
-          // 完成之后销毁创建的a标签
-          document.body.removeChild(link);
 
-        })
-      },
       // 选择日期
       datachange(eve){
         if(eve ==1){
@@ -404,34 +286,42 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(name){
+      Getdialyzerdetail(value){
         const params={
-          dialyzer:name,
-          start_date:this.start_date,
-          end_date:this.end_date,
+          status_type:value,
+          start_time:this.start_date,
+          end_time:this.end_date,
           page:this.currentPage,
           limit:this.limit,
         }
-        Getdialyzerdetail(params).then(response =>{
+        Getbpdetail(params).then(response =>{
           if(response.data.state == 1){
-            const list = response.data.data.prescriptions
+            const list = response.data.data.list
             const table=[]
-            list.forEach((item,index)=>{
-              const obj ={
-                index:index+1,
-                dialysis_no:item.patient.dialysis_no,
-                name:item.patient.name,
-                date:this.getTime(item.record_date),
-                mode_name:this.getmode(item.mode_id),
-                dialyszers:item.dialysis_dialyszers +'  '+ item.dialysis_irrigation+'  '+item.dialysis_strainer
-                // dialyszers:item.dialysis_dialyszers || item.dialysis_irrigation || item.dialysis_strainer
-              }
-              table.push(obj)
-            })
-            this.tableData = table
-            this.total = response.data.data.total
+            if(list.length > 0){
+              list.forEach((item,index)=>{
+                const obj ={
+                  index:index+1,
+                  dialysis_no:item.dialysis_no,
+                  patient_name:item.patient_name,
+                  gender:this.getgender(item.gender),
+                  age:item.age,
+                  dialysis_date:this.getTime(item.assessment_date),
+                  dryweight:item.dry_weight,
+                  UltrafiltrationVol:item.ultrafiltration_vol/1000,
+                  actual_ultrafiltration:item.actual_ultrafiltration,
+                  ultrafiltration_rate:item.ultrafiltration_rate,
+                  preDialysisBP:item.pre_dialysis_bp,
+                  monitoringbp:item.monitoring_bp,
+                  PostDialysisBP:item.post_dialysis_bp,
+                }
+                table.push(obj)
+              })
+              this.tableData = table
+              this.total = response.data.data.total
+            }
           }
-          console.log('77777',response);
+          console.log('77777血压表格',response);
         })
       },
        // 首先定义一个getPreviousDate函数，方便调用
@@ -536,21 +426,25 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        this.Getdialyzerdetail(this.status_value)
       },
       handleSizeChange(val){
         this.limit = val
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        this.Getdialyzerdetail(this.status_value)
       },
-      // 透析模式
-      getmode(ids){
-        const modes=this.modearr
-        for(let i in modes){
-          if(ids == modes[i].id){
-            return modes[i].name
-          }
+       // 性别
+       getgender(ids){
+        if(ids ==1){
+          return "男"
+        }else{
+          return "女"
         }
       },
+      // getVol(value){
+      //   if(value >1000){
+
+      //   }
+      // },
        // 转换时间
       getTime(val) {
         if(val < 0){
@@ -573,27 +467,14 @@ import html2canvas from "html2canvas"
         }
         return new Blob([u8arr], { type: mime });
       },
-      // 全部透析器
-      Getdialyzerconfig(){
-        Getdialyzerconfig().then(response =>{
-          console.log('666666',response);
-        })
-      },
-      getdialyze(val){
-        const option = this.dialyze_options
-        for(let i in option){
-          if(val == option[i].id){
-            return option[i].name
-          }
-        }
-      }
+
     },
     mounted(){
-      this.getecharts()
+
     },
     created(){
       this.start_date = this.getFirstDayOfMonth(new Date())
-      this.Getdialyzerconfig()
+      this.Getdialyzerdetail(this.status_value)
     },
 
   }

src/xt_pages/Dialysisanalysis/weightblood/components/dialyze_after.vue

@@ -68,10 +68,10 @@
       <el-dialog
         title="详情"
         :visible.sync="dialyze_dialog"
-        width="80%">
+        width="90%">
         <div>
           <div style="display: flex;margin-bottom: 20px;">
-            <div style="flex: 2;display: flex;flex-wrap:wrap">
+            <div style="flex: 5;display: flex;flex-wrap:wrap">
               <div>
                 日期：
                 <el-select v-model="date_value" @change="datachange" placeholder="请选择" style="width: 100px;">
@@ -100,44 +100,45 @@
                   style="width: 150px;">
                 </el-date-picker>
               </div>
+
               <div>
                 体重增长:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="weight_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in weight_gain"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div>
                 干体重:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="dry_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in status_options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div>
                 透后体重:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="after_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in after_options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div >
-                <el-input v-model="input" placeholder="搜索患者姓名"></el-input>
+                <el-input v-model="Patient_name" placeholder="搜索患者姓名" style="width: 120px;"></el-input>
               </div>
             </div>
             <div style="flex: 1;">
@@ -167,12 +168,12 @@
               label="患者姓名">
             </el-table-column>
             <el-table-column
-              prop="name"
+              prop="sex"
               label="性别"
               width="">
             </el-table-column>
             <el-table-column
-              prop="name"
+              prop="age"
               label="年龄"
               width="">
             </el-table-column>
@@ -182,26 +183,26 @@
               width="">
             </el-table-column>
             <el-table-column
-              prop="mode_name"
+              prop="dry_weight"
               label="干体重"
               width="">
             </el-table-column>
             <el-table-column
-              prop="dialyszers"
+              prop="last_weight_after"
               label="前次透后体重">
             </el-table-column>
             <el-table-column
-              prop="date"
+              prop="weight_before"
               label="透前体重"
               width="">
             </el-table-column>
             <el-table-column
-              prop="mode_name"
+              prop="weight_add"
               label="体重增加"
               width="">
             </el-table-column>
             <el-table-column
-              prop="dialyszers"
+              prop="weight_after"
               label="透后体重">
             </el-table-column>
           </el-table>
@@ -230,7 +231,7 @@
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getdialyzer,Getdialyzerdetail,Getdialyzerconfig} from '../../../../api/qcd'
+import {Getpatinetweight,Getweightdetail} from '../../../../api/qcd'
 import { forEach } from 'jszip';
 import html2canvas from "html2canvas"
   export default {
@@ -250,23 +251,22 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        dialyze_options:[],
+        weight_gain:[{value:1,label:'体重增长<=3%'},{value:2,label:'3%<体重增长<5%'},{value:3,label:'体重增长>=5%'}],
+        weight_value:0,
+        dry_value:0,
+        after_value:0,
+        after_options:[],
+        Patient_name:'',
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
-        modearr:[{ id: 1, name: 'HD' },{ id: 2, name: 'HDF' },{ id: 3, name: 'HD + HP' },{ id: 4, name: 'HP' },
-          { id: 5, name: 'HF' },{ id: 6, name: 'SCUF' },{ id: 7, name: 'IUF' },{ id: 8, name: 'HFHD' },{ id: 9, name: 'HFHD+HP' },
-          { id: 10, name: 'PHF' },{ id: 11, name: 'HFR' },{ id: 12, name: 'HDF+HP' },{ id: 13, name: 'CRRT' },{ id: 14, name: '腹水回输' },
-          { id:19, name:"IUF+HD"},{ id:20, name:"UF"},{ id:21, name:"HD+"},{ id:22, name:"血浆胆红素吸附+HDF"},{ id:23, name:"血浆胆红素吸附"},
-          { id:24, name:"I-HDF"},{ id:25, name:"HD高通"},{ id:26, name:"CVVH"},{ id:27, name:"CVVHD"},{ id:28, name:"CVVHDF"},{ id:29, name:"PE"},
-          { id:30, name:"血浆胆红素吸附+HP"},{ id:31, name:"HPD"},{ id:32, name:"HDP"},{ id:33, name:"HFD"},{ id:34, name:"HDF100"},
-          { id:35, name:"HDF600"},{ id:36, name:"HDF800"},{ id:37, name:"HDF1000"},
-        ],
+        status_options:[{value:1,label:'小于40kg'},{value:2,label:'40~50kg'},{value:3,label:'60~70kg'},
+                        {value:4,label:'大于70kg'},{value:5,label:'未知'}],
+
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
-
-        input:'',
+        Patient_name:'',
       }
     },
     methods:{
@@ -279,31 +279,28 @@ import html2canvas from "html2canvas"
         var chartDom = document.getElementById('mychart')
         var myChart = echarts.init(chartDom);
         const params ={
-          start_date:this.start_date,
-          end_date:this.end_date,
+          start_time:this.start_date,
+          end_time:this.end_date,
+          statistics_type:4,
         }
-        Getdialyzer(params).then(response =>{
+        Getpatinetweight(params).then(response =>{
           console.log('ressponse',response.data.data);
           if(response.data.state ==1){
             console.log('bbbbbbbbb',response.data.data);
-            const list = response.data.data.data
+            const list = response.data.data.list
             const xAxis =[]
             const yAxis = []
-            list.forEach(item =>{
-
-              xAxis.push(item.name)
-              yAxis.push(item.count)
-            })
-            this.bar_xAxis = xAxis
-            const options = []
-            for(let i in xAxis){
-              const arr ={
-                id:i+1,
-                name:xAxis[i]
+            var weight = []
+            for(let i in list){
+              xAxis.push(list[i].name)
+              yAxis.push(list[i].total)
+               const obj ={
+                value:i+1,
+                label:list[i].name
               }
-              options.push(arr)
+              weight.push(obj)
             }
-            this.dialyze_options = options
+            this.after_options = weight
             const option = {
               xAxis: {
                 type: 'category',
@@ -355,7 +352,12 @@ import html2canvas from "html2canvas"
             myChart.on('click',params =>{
               this.dialyze_dialog = true
               console.log('vvvvv',params);
-              this.Getdialyzerdetail(params.name)
+              for(let i in this.after_options){
+                if(params.name = this.after_options[i].label){
+                  this.after_value = this.after_options[i].value
+                }
+              }
+              this.Getdialyzerdetail(this.after_value)
             })
           }
 
@@ -365,7 +367,7 @@ import html2canvas from "html2canvas"
       // 导出excel
       exportExcel(){
         let tableData = [
-          ['序号', '透析号', '患者姓名', '透析日期','透析模式', '透析器']//导出表头
+          ['序号', '透析号', '患者姓名','性别','年龄','透析日期','干体重','前次透后体重','透前体重','体重增加','透后体重',]//导出表头
         ]
         this.tableData.forEach((item,index) =>{
           let rowdata=[]
@@ -373,16 +375,23 @@ import html2canvas from "html2canvas"
             item.index,
             item.dialysis_no,
             item.name,
+            item.sex,
+            item.age,
             item.date,
-            item.mode_name,
-            item.dialyszers,
+
+            item.dry_weight,
+            item.last_weight_after,
+            item.weight_before,
+            item.weight_add,
+            item.weight_after
+
           ]
           tableData.push(rowdata)
         })
         let workSheet = XLSX.utils.aoa_to_sheet(tableData);
         let bookNew = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(bookNew, workSheet, '透析器使用统计') // 工作簿名称
-        let name = '透析器使用统计'+ '.xlsx'
+        XLSX.utils.book_append_sheet(bookNew, workSheet, '患者透后体重分析') // 工作簿名称
+        let name = '患者透后体重分析'+ '.xlsx'
         XLSX.writeFile(bookNew, name) // 保存的文件名
       },
       // 查询
@@ -485,32 +494,41 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(name){
-        const params={
-          dialyzer:name,
-          start_date:this.start_date,
-          end_date:this.end_date,
+      Getdialyzerdetail(after){
+        const params ={
+          start_time:this.start_date,
+          end_time:this.end_date,
+          add_type:this.weight_value,
+          dry_type:this.dry_value,
+          after_type:after,
+          keyword:this.Patient_name,
           page:this.currentPage,
           limit:this.limit,
         }
-        Getdialyzerdetail(params).then(response =>{
+        Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
-            const list = response.data.data.prescriptions
+            const list = response.data.data.list
             const table=[]
-            list.forEach((item,index)=>{
-              const obj ={
-                index:index+1,
-                dialysis_no:item.patient.dialysis_no,
-                name:item.patient.name,
-                date:this.getTime(item.record_date),
-                mode_name:this.getmode(item.mode_id),
-                dialyszers:item.dialysis_dialyszers +'  '+ item.dialysis_irrigation+'  '+item.dialysis_strainer
-                // dialyszers:item.dialysis_dialyszers || item.dialysis_irrigation || item.dialysis_strainer
-              }
-              table.push(obj)
-            })
-            this.tableData = table
-            this.total = response.data.data.total
+            if(list.length>0){
+              list.forEach((item,index)=>{
+                const obj ={
+                  index:index+1,
+                  dialysis_no:item.dialysis_no,
+                  name:item.patient_name,
+                  sex:this.getgender(item.gender),
+                  age:item.age,
+                  date:this.getTime(item.assessment_date),
+                  dry_weight:item.dry_weight,
+                  last_weight_after:item.last_weight_after,
+                  weight_before:item.weight_before,
+                  weight_add:item.weight_add,
+                  weight_after:item.weight_after
+                }
+                table.push(obj)
+              })
+              this.tableData = table
+              this.total = response.data.data.total
+            }
           }
           console.log('77777',response);
         })
@@ -623,13 +641,12 @@ import html2canvas from "html2canvas"
         this.limit = val
         this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
       },
-      // 透析模式
-      getmode(ids){
-        const modes=this.modearr
-        for(let i in modes){
-          if(ids == modes[i].id){
-            return modes[i].name
-          }
+      // 性别
+      getgender(ids){
+        if(ids ==1){
+          return "男"
+        }else{
+          return "女"
         }
       },
        // 转换时间
@@ -654,12 +671,6 @@ import html2canvas from "html2canvas"
         }
         return new Blob([u8arr], { type: mime });
       },
-      // 全部透析器
-      Getdialyzerconfig(){
-        Getdialyzerconfig().then(response =>{
-          console.log('666666',response);
-        })
-      },
       getdialyze(val){
         const option = this.dialyze_options
         for(let i in option){
@@ -674,7 +685,6 @@ import html2canvas from "html2canvas"
     },
     created(){
       this.start_date = this.getFirstDayOfMonth(new Date())
-      this.Getdialyzerconfig()
     },
 
   }

src/xt_pages/Dialysisanalysis/weightblood/components/dry_denominator.vue

@@ -69,10 +69,10 @@
       <el-dialog
         title="详情"
         :visible.sync="dialyze_dialog"
-        width="80%">
+        width="90%">
         <div>
           <div style="display: flex;margin-bottom: 20px;">
-            <div style="flex: 2;display: flex;flex-wrap:wrap">
+            <div style="flex: 5;display: flex;flex-wrap:wrap">
               <div>
                 日期：
                 <el-select v-model="date_value" @change="datachange" placeholder="请选择" style="width: 100px;">
@@ -101,44 +101,45 @@
                   style="width: 150px;">
                 </el-date-picker>
               </div>
-              <div>
+
+               <div>
                 体重增长:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="weight_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in weight_gain"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div>
                 干体重:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="dry_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in status_options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div>
                 透后体重:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="after_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in after_options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div >
-                <el-input v-model="input" placeholder="搜索患者姓名"></el-input>
+                <el-input v-model="Patient_name" placeholder="搜索患者姓名" style="width: 120px;"></el-input>
               </div>
             </div>
             <div style="flex: 1;">
@@ -168,12 +169,12 @@
               label="患者姓名">
             </el-table-column>
             <el-table-column
-              prop="name"
+              prop="sex"
               label="性别"
               width="">
             </el-table-column>
             <el-table-column
-              prop="name"
+              prop="age"
               label="年龄"
               width="">
             </el-table-column>
@@ -183,26 +184,26 @@
               width="">
             </el-table-column>
             <el-table-column
-              prop="mode_name"
+              prop="dry_weight"
               label="干体重"
               width="">
             </el-table-column>
             <el-table-column
-              prop="dialyszers"
+              prop="last_weight_after"
               label="前次透后体重">
             </el-table-column>
             <el-table-column
-              prop="date"
+              prop="weight_before"
               label="透前体重"
               width="">
             </el-table-column>
             <el-table-column
-              prop="mode_name"
+              prop="weight_add"
               label="体重增加"
               width="">
             </el-table-column>
             <el-table-column
-              prop="dialyszers"
+              prop="weight_after"
               label="透后体重">
             </el-table-column>
           </el-table>
@@ -231,7 +232,7 @@
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getdialyzer,Getdialyzerdetail,Getdialyzerconfig} from '../../../../api/qcd'
+import {Getpatinetweight,Getweightdetail} from '../../../../api/qcd'
 import { forEach } from 'jszip';
 import html2canvas from "html2canvas"
   export default {
@@ -251,18 +252,17 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        dialyze_options:[],
+        weight_gain:[],
+        weight_value:0,
+        dry_value:0,
+        after_value:0,
+        after_options:[{value:1,label:'达到干体重'},{value:2,label:'未达到干体重'},{value:3,label:'其他或卧床'}],
+        Patient_name:'',
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
-        modearr:[{ id: 1, name: 'HD' },{ id: 2, name: 'HDF' },{ id: 3, name: 'HD + HP' },{ id: 4, name: 'HP' },
-          { id: 5, name: 'HF' },{ id: 6, name: 'SCUF' },{ id: 7, name: 'IUF' },{ id: 8, name: 'HFHD' },{ id: 9, name: 'HFHD+HP' },
-          { id: 10, name: 'PHF' },{ id: 11, name: 'HFR' },{ id: 12, name: 'HDF+HP' },{ id: 13, name: 'CRRT' },{ id: 14, name: '腹水回输' },
-          { id:19, name:"IUF+HD"},{ id:20, name:"UF"},{ id:21, name:"HD+"},{ id:22, name:"血浆胆红素吸附+HDF"},{ id:23, name:"血浆胆红素吸附"},
-          { id:24, name:"I-HDF"},{ id:25, name:"HD高通"},{ id:26, name:"CVVH"},{ id:27, name:"CVVHD"},{ id:28, name:"CVVHDF"},{ id:29, name:"PE"},
-          { id:30, name:"血浆胆红素吸附+HP"},{ id:31, name:"HPD"},{ id:32, name:"HDP"},{ id:33, name:"HFD"},{ id:34, name:"HDF100"},
-          { id:35, name:"HDF600"},{ id:36, name:"HDF800"},{ id:37, name:"HDF1000"},
-        ],
+        status_options:[{value:1,label:'小于40kg'},{value:2,label:'40~50kg'},{value:3,label:'60~70kg'},
+                        {value:4,label:'大于70kg'},{value:5,label:'未知'}],
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
@@ -280,31 +280,28 @@ import html2canvas from "html2canvas"
         var chartDom = document.getElementById('mychart')
         var myChart = echarts.init(chartDom);
         const params ={
-          start_date:this.start_date,
-          end_date:this.end_date,
+          start_time:this.start_date,
+          end_time:this.end_date,
+          statistics_type:3,
         }
-        Getdialyzer(params).then(response =>{
+        Getpatinetweight(params).then(response =>{
           console.log('ressponse',response.data.data);
           if(response.data.state ==1){
             console.log('bbbbbbbbb',response.data.data);
-            const list = response.data.data.data
+            const list = response.data.data.list
             const xAxis =[]
             const yAxis = []
-            list.forEach(item =>{
-
-              xAxis.push(item.name)
-              yAxis.push(item.count)
-            })
-            this.bar_xAxis = xAxis
-            const options = []
-            for(let i in xAxis){
-              const arr ={
-                id:i+1,
-                name:xAxis[i]
+            const weight = []
+            for(let i in list){
+              xAxis.push(list[i].name)
+              yAxis.push(list[i].total)
+               const obj ={
+                value:i+1,
+                label:list[i].name
               }
-              options.push(arr)
+              weight.push(obj)
             }
-            this.dialyze_options = options
+            this.weight_gain = weight
             const option = {
               xAxis: {
                 type: 'category',
@@ -356,7 +353,12 @@ import html2canvas from "html2canvas"
             myChart.on('click',params =>{
               this.dialyze_dialog = true
               console.log('vvvvv',params);
-              this.Getdialyzerdetail(params.name)
+              for(let i in this.weight_gain){
+                if(params.name = this.weight_gain[i].label){
+                  this.weight_value = this.weight_gain[i].value
+                }
+              }
+              this.Getdialyzerdetail(this.weight_value)
             })
           }
 
@@ -366,7 +368,7 @@ import html2canvas from "html2canvas"
       // 导出excel
       exportExcel(){
         let tableData = [
-          ['序号', '透析号', '患者姓名', '透析日期','透析模式', '透析器']//导出表头
+          ['序号', '透析号', '患者姓名','性别','年龄','透析日期','干体重','前次透后体重','透前体重','体重增加','透后体重',]//导出表头
         ]
         this.tableData.forEach((item,index) =>{
           let rowdata=[]
@@ -374,16 +376,23 @@ import html2canvas from "html2canvas"
             item.index,
             item.dialysis_no,
             item.name,
+            item.sex,
+            item.age,
             item.date,
-            item.mode_name,
-            item.dialyszers,
+
+            item.dry_weight,
+            item.last_weight_after,
+            item.weight_before,
+            item.weight_add,
+            item.weight_after
+
           ]
           tableData.push(rowdata)
         })
         let workSheet = XLSX.utils.aoa_to_sheet(tableData);
         let bookNew = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(bookNew, workSheet, '透析器使用统计') // 工作簿名称
-        let name = '透析器使用统计'+ '.xlsx'
+        XLSX.utils.book_append_sheet(bookNew, workSheet, '患者体重增长分析（以干体重为分母）') // 工作簿名称
+        let name = '患者体重增长分析（以干体重为分母）'+ '.xlsx'
         XLSX.writeFile(bookNew, name) // 保存的文件名
       },
       // 查询
@@ -486,32 +495,41 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(name){
-        const params={
-          dialyzer:name,
-          start_date:this.start_date,
-          end_date:this.end_date,
+      Getdialyzerdetail(add){
+        const params ={
+          start_time:this.start_date,
+          end_time:this.end_date,
+          add_type:add,
+          dry_type:this.dry_value,
+          after_type:this.after_value,
+          keyword:this.Patient_name,
           page:this.currentPage,
           limit:this.limit,
         }
-        Getdialyzerdetail(params).then(response =>{
+        Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
-            const list = response.data.data.prescriptions
+            const list = response.data.data.list
             const table=[]
-            list.forEach((item,index)=>{
-              const obj ={
-                index:index+1,
-                dialysis_no:item.patient.dialysis_no,
-                name:item.patient.name,
-                date:this.getTime(item.record_date),
-                mode_name:this.getmode(item.mode_id),
-                dialyszers:item.dialysis_dialyszers +'  '+ item.dialysis_irrigation+'  '+item.dialysis_strainer
-                // dialyszers:item.dialysis_dialyszers || item.dialysis_irrigation || item.dialysis_strainer
-              }
-              table.push(obj)
-            })
-            this.tableData = table
-            this.total = response.data.data.total
+            if(list.length>0){
+              list.forEach((item,index)=>{
+                const obj ={
+                  index:index+1,
+                  dialysis_no:item.dialysis_no,
+                  name:item.patient_name,
+                  sex:this.getgender(item.gender),
+                  age:item.age,
+                  date:this.getTime(item.assessment_date),
+                  dry_weight:item.dry_weight,
+                  last_weight_after:item.last_weight_after,
+                  weight_before:item.weight_before,
+                  weight_add:item.weight_add,
+                  weight_after:item.weight_after
+                }
+                table.push(obj)
+              })
+              this.tableData = table
+              this.total = response.data.data.total
+            }
           }
           console.log('77777',response);
         })
@@ -624,13 +642,12 @@ import html2canvas from "html2canvas"
         this.limit = val
         this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
       },
-      // 透析模式
-      getmode(ids){
-        const modes=this.modearr
-        for(let i in modes){
-          if(ids == modes[i].id){
-            return modes[i].name
-          }
+      // 性别
+      getgender(ids){
+        if(ids ==1){
+          return "男"
+        }else{
+          return "女"
         }
       },
        // 转换时间
@@ -655,12 +672,6 @@ import html2canvas from "html2canvas"
         }
         return new Blob([u8arr], { type: mime });
       },
-      // 全部透析器
-      Getdialyzerconfig(){
-        Getdialyzerconfig().then(response =>{
-          console.log('666666',response);
-        })
-      },
       getdialyze(val){
         const option = this.dialyze_options
         for(let i in option){
@@ -675,7 +686,7 @@ import html2canvas from "html2canvas"
     },
     created(){
       this.start_date = this.getFirstDayOfMonth(new Date())
-      this.Getdialyzerconfig()
+
     },
 
   }

src/xt_pages/Dialysisanalysis/weightblood/components/dry_weight.vue

@@ -149,11 +149,11 @@
                 label="年龄">
               </el-table-column>
               <el-table-column
-                prop="dialysis_date"
+                prop="dry"
                 label="干体重"
                 width="">
               </el-table-column>
-             
+
             </el-table>
           </div>
           <div style="text-align:right;margin-top: 10px;">
@@ -180,7 +180,7 @@
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getdialysistreatfinish,Getdialysistreatdetail} from '../../../../api/qcd'
+import {Getpatinetweight,Getweightdetail} from '../../../../api/qcd'
 import {getAllNurseList} from '@/api/fallassement'
 import { getAllDoctorList} from "@/api/device"
 import html2canvas from "html2canvas"
@@ -201,14 +201,13 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        // status_options:[],
+        status_options:[],
         nurseList:[],
         operators:[],
         docList:[],
-        status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
-        // status_options:[{value:1,label:'待定卧床'},{value:2,label:'<40KG'},{value:3,label:'40-50KG'},
-        //                 {value:4,label:'50-60KG'},{value:5,label:'<60-70KG'},{value:6,label:'>70KG'}
-        //                 ],
+        // status_options:[{value:1,label:'小于40kg'},{value:2,label:'40~50kg'},{value:3,label:'60~70kg'},
+        //                 {value:4,label:'大于70kg'},{value:5,label:'未知'}],
+
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
@@ -234,37 +233,37 @@ import html2canvas from "html2canvas"
         var chartDom = document.getElementById('mychart')
         var myChart = echarts.init(chartDom);
         const params={
-          start_date:this.start_date,
-          end_date:this.end_date
+          start_time:this.start_date,
+          end_time:this.end_date,
+          statistics_type:1,
         }
-        Getdialysistreatfinish(params).then(response =>{
+        Getpatinetweight(params).then(response =>{
           if(response.data.state ==1){
-            const list = response.data.data.data
+            const list = response.data.data.list
             const xAxis = []
             const yAxis = []
-
-            const total = response.data.data.total
+            var option =[]
+            var total = 0
             for(let key in list){
               const obj={
-                name:key,
-                value:list[key]
+                name:list[key].name,
+                value:list[key].total
               }
+              total = total + list[key].total
               xAxis.push(obj)
-              yAxis.push(key)
+              yAxis.push(list[key].name)
+              const objs = {
+                value:(key*1)+1,
+                label:list[key].name
+              }
+              option.push(objs)
             }
+            this.status_options = option
             const status = []
-            // for(let i in yAxis){
-            //   const obj ={
-            //     value:(i*1)+1,
-            //     label:yAxis[i]
-            //   }
-            //   status.push(obj)
-            // }
-            // this.status_options = status
-            console.log('this.status_options',this.status_options);
+            console.log('this.status_options',response.data.data);
             const option = {
                 title:{
-                  text:'总数'+total,
+                  text:'总数'+total+'人',
                   left:'5%',
                   bottom:'5%',
                   textStyle:{
@@ -322,14 +321,16 @@ import html2canvas from "html2canvas"
             myChart.setOption(option);
             myChart.on('click',params =>{
               this.complete_dialog = true
-              console.log('bbbb',params);
-              var status_id =''
+              console.log('bbbb',params,this.status_options);
+              // var status_val = ''
               for(let i in this.status_options){
                 if(params.data.name == this.status_options[i].label){
-                  status_id = this.status_options[i].value
+                  this.status_value = this.status_options[i].value
                 }
               }
-              this.getdetail(status_id)
+              console.log(' this.status_value', this.status_value);
+
+              this.getdetail(this.status_value)
             })
           }
         })
@@ -372,7 +373,7 @@ import html2canvas from "html2canvas"
       // 导出excel
       derive_click(){
         let tableData = [
-          ['序号', '透析号', '患者姓名', '年龄','透析日期', '处方透析时长', '实际透析时长', '实际差(min)', '主治医生', '主治护士']//导出表头
+          ['序号', '透析号', '患者姓名', '年龄','干体重']//导出表头
         ]
         this.tableData.forEach((item,index) =>{
           let rowdata=[]
@@ -381,54 +382,49 @@ import html2canvas from "html2canvas"
             item.dialysis_no,
             item.patient_name,
             item.age,
-            item.dialysis_date,
-            item.dialysis_duration,
-            item.actual_duration,
-            item.diff,
-            item.doctor,
-            item.nurse,
+            item.dry,
           ]
           tableData.push(rowdata)
         })
         let workSheet = XLSX.utils.aoa_to_sheet(tableData);
         let bookNew = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(bookNew, workSheet, '透析治疗完成率') // 工作簿名称
-        let name = '透析治疗完成率'+ '.xlsx'
+        XLSX.utils.book_append_sheet(bookNew, workSheet, '患者干体重分析') // 工作簿名称
+        let name = '患者干体重分析'+ '.xlsx'
         XLSX.writeFile(bookNew, name) // 保存的文件名
       },
       // 详情数据源
-      getdetail(mode){
+      getdetail(dry){
         const params ={
-          start_date:this.start_date,
-          end_date:this.end_date,
-          mode:mode,
+          start_time:this.start_date,
+          end_time:this.end_date,
+          add_type:0,
+          dry_type:dry,
+          after_type:0,
+          keyword:'',
           page:this.currentPage,
           limit:this.limit,
         }
-        Getdialysistreatdetail(params).then(response =>{
-          if(response.data.state){
+        Getweightdetail(params).then(response =>{
+          if(response.data.state ==1){
             const list = response.data.data.list
-            const xAxis = []
+            // const xAxis = []
             const table = []
-            list.forEach((item,index) =>{
-              const obj={
-                index:index+1,
-                dialysis_no:item.dialysis_no,
-                patient_name:item.patient_name,
-                age:this.analyzeIDCard(item.id_card_no),
-                dialysis_date:item.dialysis_date.split('T')[0],
-                dialysis_duration:item.dialysis_duration,
-                actual_duration:item.actual_duration,
-                diff:item.diff,
-                doctor:this.getdoctor(item.doctor),
-                nurse:this.getnurse(item.nurse)
-              }
-              table.push(obj)
-            })
-            this.tableData = table
-            this.total = response.data.data.total
+            if(list.length >0){
+              list.forEach((item,index) =>{
+                const obj={
+                  index:index+1,
+                  dialysis_no:item.dialysis_no,
+                  patient_name:item.patient_name,
+                  age:item.age,
+                  dry:item.dry_weight,
+                }
+                table.push(obj)
+              })
+              this.tableData = table
+              this.total = response.data.data.total
+            }
           }
-          console.log('55555',response);
+          console.log('555553333干体重',response);
         })
       },
       // 选择日期
@@ -660,51 +656,15 @@ import html2canvas from "html2canvas"
         }
 
       },
-      // 护士
-      getAllNurseList(){
-        getAllNurseList().then(response=>{
-           if(response.data.state ==1){
-             var nurseList  = response.data.data.nurseList
-            console.log('0000',nurseList);
-             this.nurseList =nurseList
-           }
-        })
-      },
-      // 医生
-      getAllDoctorList(){
-        getAllDoctorList().then(response=>{
-          if(response.data.state == 1){
-              var list = response.data.data.list
-              console.log("list222222",list)
-              this.docList = list
-              this.operators = response.data.data.operators
-          }
-        })
-      },
-      getnurse(ids){
-        const nurse = this.nurseList
-        for(let i in nurse){
-          if(ids==nurse[i].admin_user_id){
-            return nurse[i].user_name
-          }
-        }
-      },
-      getdoctor(ids){
-        const doctor = this.docList
-        for(let i in doctor){
-          if(ids == doctor[i].admin_user_id){
-            return doctor[i].user_name
-          }
-        }
-      }
+
     },
     mounted(){
       this.getecharts()
     },
     created(){
       this.start_date = this.getFirstDayOfMonth(new Date())
-      this.getAllNurseList()
-      this.getAllDoctorList()
+      // this.getAllNurseList()
+      // this.getAllDoctorList()
     },
 
   }

src/xt_pages/Dialysisanalysis/weightblood/components/list_denominator.vue

@@ -69,10 +69,10 @@
       <el-dialog
         title="详情"
         :visible.sync="dialyze_dialog"
-        width="80%">
+        width="90%">
         <div>
           <div style="display: flex;margin-bottom: 20px;">
-            <div style="flex: 2;display: flex;flex-wrap:wrap">
+            <div style="flex: 5;display: flex;flex-wrap:wrap">
               <div>
                 日期：
                 <el-select v-model="date_value" @change="datachange" placeholder="请选择" style="width: 100px;">
@@ -103,42 +103,42 @@
               </div>
               <div>
                 体重增长:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="weight_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in weight_gain"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div>
                 干体重:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="dry_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in status_options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div>
                 透后体重:
-                <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="after_value" placeholder="请选择" style="width: 100px;">
                   <el-option :key="0" label="不限" :value="0"></el-option>
                   <el-option
-                    v-for="item in dialyze_options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+                    v-for="item in after_options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </div>
               <div >
-                <el-input v-model="input" placeholder="搜索患者姓名"></el-input>
+                <el-input v-model="Patient_name" placeholder="搜索患者姓名" style="width: 120px;"></el-input>
               </div>
             </div>
             <div style="flex: 1;">
@@ -168,12 +168,12 @@
               label="患者姓名">
             </el-table-column>
             <el-table-column
-              prop="name"
+              prop="sex"
               label="性别"
               width="">
             </el-table-column>
             <el-table-column
-              prop="name"
+              prop="age"
               label="年龄"
               width="">
             </el-table-column>
@@ -183,26 +183,26 @@
               width="">
             </el-table-column>
             <el-table-column
-              prop="mode_name"
+              prop="dry_weight"
               label="干体重"
               width="">
             </el-table-column>
             <el-table-column
-              prop="dialyszers"
+              prop="last_weight_after"
               label="前次透后体重">
             </el-table-column>
             <el-table-column
-              prop="date"
+              prop="weight_before"
               label="透前体重"
               width="">
             </el-table-column>
             <el-table-column
-              prop="mode_name"
+              prop="weight_add"
               label="体重增加"
               width="">
             </el-table-column>
             <el-table-column
-              prop="dialyszers"
+              prop="weight_after"
               label="透后体重">
             </el-table-column>
           </el-table>
@@ -231,7 +231,7 @@
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getdialyzer,Getdialyzerdetail,Getdialyzerconfig} from '../../../../api/qcd'
+import {Getpatinetweight,Getweightdetail} from '../../../../api/qcd'
 import { forEach } from 'jszip';
 import html2canvas from "html2canvas"
   export default {
@@ -251,18 +251,17 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        dialyze_options:[],
+        weight_gain:[],
+        weight_value:0,
+        dry_value:0,
+        after_value:0,
+        after_options:[{value:1,label:'达到干体重'},{value:2,label:'未达到干体重'},{value:3,label:'其他或卧床'}],
+        Patient_name:'',
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
-        modearr:[{ id: 1, name: 'HD' },{ id: 2, name: 'HDF' },{ id: 3, name: 'HD + HP' },{ id: 4, name: 'HP' },
-          { id: 5, name: 'HF' },{ id: 6, name: 'SCUF' },{ id: 7, name: 'IUF' },{ id: 8, name: 'HFHD' },{ id: 9, name: 'HFHD+HP' },
-          { id: 10, name: 'PHF' },{ id: 11, name: 'HFR' },{ id: 12, name: 'HDF+HP' },{ id: 13, name: 'CRRT' },{ id: 14, name: '腹水回输' },
-          { id:19, name:"IUF+HD"},{ id:20, name:"UF"},{ id:21, name:"HD+"},{ id:22, name:"血浆胆红素吸附+HDF"},{ id:23, name:"血浆胆红素吸附"},
-          { id:24, name:"I-HDF"},{ id:25, name:"HD高通"},{ id:26, name:"CVVH"},{ id:27, name:"CVVHD"},{ id:28, name:"CVVHDF"},{ id:29, name:"PE"},
-          { id:30, name:"血浆胆红素吸附+HP"},{ id:31, name:"HPD"},{ id:32, name:"HDP"},{ id:33, name:"HFD"},{ id:34, name:"HDF100"},
-          { id:35, name:"HDF600"},{ id:36, name:"HDF800"},{ id:37, name:"HDF1000"},
-        ],
+        status_options:[{value:1,label:'小于40kg'},{value:2,label:'40~50kg'},{value:3,label:'60~70kg'},
+                        {value:4,label:'大于70kg'},{value:5,label:'未知'}],
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
@@ -280,31 +279,30 @@ import html2canvas from "html2canvas"
         var chartDom = document.getElementById('mychart')
         var myChart = echarts.init(chartDom);
         const params ={
-          start_date:this.start_date,
-          end_date:this.end_date,
+          start_time:this.start_date,
+          end_time:this.end_date,
+          statistics_type:2,
         }
-        Getdialyzer(params).then(response =>{
+        Getpatinetweight(params).then(response =>{
           console.log('ressponse',response.data.data);
           if(response.data.state ==1){
             console.log('bbbbbbbbb',response.data.data);
-            const list = response.data.data.data
+            const list = response.data.data.list
             const xAxis =[]
             const yAxis = []
-            list.forEach(item =>{
-
-              xAxis.push(item.name)
-              yAxis.push(item.count)
-            })
-            this.bar_xAxis = xAxis
-            const options = []
-            for(let i in xAxis){
-              const arr ={
-                id:i+1,
-                name:xAxis[i]
+            const weight = []
+            for(let i in list){
+              xAxis.push(list[i].name)
+              yAxis.push(list[i].total)
+               const obj ={
+                value:i+1,
+                label:list[i].name
               }
-              options.push(arr)
+              weight.push(obj)
             }
-            this.dialyze_options = options
+            this.weight_gain = weight
+            this.bar_xAxis = xAxis
+
             const option = {
               xAxis: {
                 type: 'category',
@@ -356,7 +354,12 @@ import html2canvas from "html2canvas"
             myChart.on('click',params =>{
               this.dialyze_dialog = true
               console.log('vvvvv',params);
-              this.Getdialyzerdetail(params.name)
+              for(let i in this.weight_gain){
+                if(params.name = this.weight_gain[i].label){
+                  this.weight_value = this.weight_gain[i].value
+                }
+              }
+              this.Getdialyzerdetail(this.weight_value)
             })
           }
 
@@ -366,7 +369,7 @@ import html2canvas from "html2canvas"
       // 导出excel
       exportExcel(){
         let tableData = [
-          ['序号', '透析号', '患者姓名', '透析日期','透析模式', '透析器']//导出表头
+          ['序号', '透析号', '患者姓名','性别','年龄','透析日期','干体重','前次透后体重','透前体重','体重增加','透后体重',]//导出表头
         ]
         this.tableData.forEach((item,index) =>{
           let rowdata=[]
@@ -374,16 +377,23 @@ import html2canvas from "html2canvas"
             item.index,
             item.dialysis_no,
             item.name,
+            item.sex,
+            item.age,
             item.date,
-            item.mode_name,
-            item.dialyszers,
+
+            item.dry_weight,
+            item.last_weight_after,
+            item.weight_before,
+            item.weight_add,
+            item.weight_after
+
           ]
           tableData.push(rowdata)
         })
         let workSheet = XLSX.utils.aoa_to_sheet(tableData);
         let bookNew = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(bookNew, workSheet, '透析器使用统计') // 工作簿名称
-        let name = '透析器使用统计'+ '.xlsx'
+        XLSX.utils.book_append_sheet(bookNew, workSheet, '患者体重增长分析（以上次透后体重为分母）') // 工作簿名称
+        let name = '患者体重增长分析（以上次透后体重为分母）'+ '.xlsx'
         XLSX.writeFile(bookNew, name) // 保存的文件名
       },
       // 查询
@@ -392,7 +402,7 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       deil_click(){
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        this.Getdialyzerdetail(this.weight_value)
       },
        // 下载
       Download_click(){
@@ -486,34 +496,44 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(name){
-        const params={
-          dialyzer:name,
-          start_date:this.start_date,
-          end_date:this.end_date,
+      Getdialyzerdetail(add){
+        const params ={
+          start_time:this.start_date,
+          end_time:this.end_date,
+          add_type:add,
+          dry_type:this.dry_value,
+          after_type:this.after_value,
+          keyword:this.Patient_name,
           page:this.currentPage,
           limit:this.limit,
         }
-        Getdialyzerdetail(params).then(response =>{
+        Getweightdetail(params).then(response =>{
+          console.log('77777',response);
           if(response.data.state == 1){
-            const list = response.data.data.prescriptions
+            const list = response.data.data.list
             const table=[]
-            list.forEach((item,index)=>{
-              const obj ={
-                index:index+1,
-                dialysis_no:item.patient.dialysis_no,
-                name:item.patient.name,
-                date:this.getTime(item.record_date),
-                mode_name:this.getmode(item.mode_id),
-                dialyszers:item.dialysis_dialyszers +'  '+ item.dialysis_irrigation+'  '+item.dialysis_strainer
-                // dialyszers:item.dialysis_dialyszers || item.dialysis_irrigation || item.dialysis_strainer
-              }
-              table.push(obj)
-            })
-            this.tableData = table
-            this.total = response.data.data.total
+            if(list.length>0){
+              list.forEach((item,index)=>{
+                const obj ={
+                  index:index+1,
+                  dialysis_no:item.dialysis_no,
+                  name:item.patient_name,
+                  sex:this.getgender(item.gender),
+                  age:item.age,
+                  date:this.getTime(item.assessment_date),
+                  dry_weight:item.dry_weight,
+                  last_weight_after:item.last_weight_after,
+                  weight_before:item.weight_before,
+                  weight_add:item.weight_add,
+                  weight_after:item.weight_after
+                }
+                table.push(obj)
+              })
+              this.tableData = table
+              this.total = response.data.data.total
+            }
           }
-          console.log('77777',response);
+
         })
       },
        // 首先定义一个getPreviousDate函数，方便调用
@@ -618,19 +638,18 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        this.Getdialyzerdetail(this.weight_value)
       },
       handleSizeChange(val){
         this.limit = val
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        this.Getdialyzerdetail(this.weight_value)
       },
-      // 透析模式
-      getmode(ids){
-        const modes=this.modearr
-        for(let i in modes){
-          if(ids == modes[i].id){
-            return modes[i].name
-          }
+      // 性别
+      getgender(ids){
+        if(ids ==1){
+          return "男"
+        }else{
+          return "女"
         }
       },
        // 转换时间
@@ -655,27 +674,12 @@ import html2canvas from "html2canvas"
         }
         return new Blob([u8arr], { type: mime });
       },
-      // 全部透析器
-      Getdialyzerconfig(){
-        Getdialyzerconfig().then(response =>{
-          console.log('666666',response);
-        })
-      },
-      getdialyze(val){
-        const option = this.dialyze_options
-        for(let i in option){
-          if(val == option[i].id){
-            return option[i].name
-          }
-        }
-      }
     },
     mounted(){
       this.getecharts()
     },
     created(){
       this.start_date = this.getFirstDayOfMonth(new Date())
-      this.Getdialyzerconfig()
     },
 
   }

src/xt_pages/Dialysisanalysis/weightblood/components/weight_table.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
       <div class="page_patientControlAnalysis">
         <div style="display: flex;margin-bottom: 20px;">
-          <div style="flex: 2;display: flex;flex-wrap:wrap">
+          <div style="flex: 6;display: flex;flex-wrap:wrap">
             <div>
               日期：
               <el-select v-model="date_value" @change="datachange" placeholder="请选择" style="width: 100px;">
@@ -40,44 +40,45 @@
                 style="width: 150px;">
               </el-date-picker>
             </div>
+
             <div>
               体重增长:
-              <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+              <el-select v-model="weight_value" placeholder="请选择" style="width: 100px;">
                 <el-option :key="0" label="不限" :value="0"></el-option>
                 <el-option
-                  v-for="item in dialyze_options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                  v-for="item in weight_gain"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
                 </el-option>
               </el-select>
             </div>
             <div>
               干体重:
-              <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+              <el-select v-model="dry_value" placeholder="请选择" style="width: 100px;">
                 <el-option :key="0" label="不限" :value="0"></el-option>
                 <el-option
-                  v-for="item in dialyze_options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                  v-for="item in status_options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
                 </el-option>
               </el-select>
             </div>
             <div>
               透后体重:
-              <el-select v-model="dialyze_value" placeholder="请选择" style="width: 100px;">
+              <el-select v-model="after_value" placeholder="请选择" style="width: 100px;">
                 <el-option :key="0" label="不限" :value="0"></el-option>
                 <el-option
-                  v-for="item in dialyze_options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                  v-for="item in after_options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
                 </el-option>
               </el-select>
             </div>
             <div >
-              <el-input v-model="input" placeholder="搜索患者姓名"></el-input>
+              <el-input v-model="Patient_name" placeholder="搜索患者姓名"></el-input>
             </div>
           </div>
           <div style="flex: 1;">
@@ -89,62 +90,62 @@
         </div>
 
         <el-table :data="tableData" border style="width: 100%"
-        :header-cell-style="{textAlign: 'center'}"
-        :cell-style="{ textAlign: 'center' }"
-        height="380">
-          <el-table-column
-            prop="index"
-            label="序号"
-            width="">
-          </el-table-column>
-          <el-table-column
-            prop="dialysis_no"
-            label="透析号"
-            width="">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="患者姓名">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="性别"
-            width="">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="年龄"
-            width="">
-          </el-table-column>
-          <el-table-column
-            prop="date"
-            label="透析日期"
-            width="">
-          </el-table-column>
-          <el-table-column
-            prop="mode_name"
-            label="干体重"
-            width="">
-          </el-table-column>
-          <el-table-column
-            prop="dialyszers"
-            label="前次透后体重">
-          </el-table-column>
-          <el-table-column
-            prop="date"
-            label="透前体重"
-            width="">
-          </el-table-column>
-          <el-table-column
-            prop="mode_name"
-            label="体重增加"
-            width="">
-          </el-table-column>
-          <el-table-column
-            prop="dialyszers"
-            label="透后体重">
-          </el-table-column>
-        </el-table>
+          :header-cell-style="{textAlign: 'center'}"
+          :cell-style="{ textAlign: 'center' }"
+          height="380">
+            <el-table-column
+              prop="index"
+              label="序号"
+              width="">
+            </el-table-column>
+            <el-table-column
+              prop="dialysis_no"
+              label="透析号"
+              width="">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="患者姓名">
+            </el-table-column>
+            <el-table-column
+              prop="sex"
+              label="性别"
+              width="">
+            </el-table-column>
+            <el-table-column
+              prop="age"
+              label="年龄"
+              width="">
+            </el-table-column>
+            <el-table-column
+              prop="date"
+              label="透析日期"
+              width="">
+            </el-table-column>
+            <el-table-column
+              prop="dry_weight"
+              label="干体重"
+              width="">
+            </el-table-column>
+            <el-table-column
+              prop="last_weight_after"
+              label="前次透后体重">
+            </el-table-column>
+            <el-table-column
+              prop="weight_before"
+              label="透前体重"
+              width="">
+            </el-table-column>
+            <el-table-column
+              prop="weight_add"
+              label="体重增加"
+              width="">
+            </el-table-column>
+            <el-table-column
+              prop="weight_after"
+              label="透后体重">
+            </el-table-column>
+          </el-table>
         <div style="text-align: right;margin-top: 10px;">
           <el-pagination
             @size-change="handleSizeChange"
@@ -160,14 +161,14 @@
     </div>
 
     <!-- 弹窗 -->
-   
+
   </div>
 </template>
 <script>
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getdialyzer,Getdialyzerdetail,Getdialyzerconfig} from '../../../../api/qcd'
+import {Getweightdetail} from '../../../../api/qcd'
 import { forEach } from 'jszip';
 import html2canvas from "html2canvas"
   export default {
@@ -187,23 +188,28 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        dialyze_options:[],
+
+        weight_gain:[{value:1,label:'体重增长<=3%'},{value:2,label:'3%<体重增长<5%'},{value:3,label:'体重增长>=5%'}],
+        weight_value:0,
+        dry_value:0,
+        after_value:0,
+        after_options:[{value:1,label:'达到干体重'},{value:2,label:'未达到干体重'},{value:3,label:'其他或卧床'}],
+        Patient_name:'',
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
-        modearr:[{ id: 1, name: 'HD' },{ id: 2, name: 'HDF' },{ id: 3, name: 'HD + HP' },{ id: 4, name: 'HP' },
-          { id: 5, name: 'HF' },{ id: 6, name: 'SCUF' },{ id: 7, name: 'IUF' },{ id: 8, name: 'HFHD' },{ id: 9, name: 'HFHD+HP' },
-          { id: 10, name: 'PHF' },{ id: 11, name: 'HFR' },{ id: 12, name: 'HDF+HP' },{ id: 13, name: 'CRRT' },{ id: 14, name: '腹水回输' },
-          { id:19, name:"IUF+HD"},{ id:20, name:"UF"},{ id:21, name:"HD+"},{ id:22, name:"血浆胆红素吸附+HDF"},{ id:23, name:"血浆胆红素吸附"},
-          { id:24, name:"I-HDF"},{ id:25, name:"HD高通"},{ id:26, name:"CVVH"},{ id:27, name:"CVVHD"},{ id:28, name:"CVVHDF"},{ id:29, name:"PE"},
-          { id:30, name:"血浆胆红素吸附+HP"},{ id:31, name:"HPD"},{ id:32, name:"HDP"},{ id:33, name:"HFD"},{ id:34, name:"HDF100"},
-          { id:35, name:"HDF600"},{ id:36, name:"HDF800"},{ id:37, name:"HDF1000"},
-        ],
+        status_options:[{value:1,label:'小于40kg'},{value:2,label:'40~50kg'},{value:3,label:'60~70kg'},
+                        {value:4,label:'大于70kg'},{value:5,label:'未知'}],
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
 
 
-        input:'',
+        // weight_gain:[],
+        weight_value:0,
+        dry_value:0,
+        after_value:0,
+        // after_options:[],
+        Patient_name:'',
       }
     },
     methods:{
@@ -211,98 +217,10 @@ import html2canvas from "html2canvas"
       return_click(){
         this.$router.push('/Dialysisanalysis/qualitycontrol/weightblood')
       },
-      // 数据源
-      getecharts(){
-        var chartDom = document.getElementById('mychart')
-        var myChart = echarts.init(chartDom);
-        const params ={
-          start_date:this.start_date,
-          end_date:this.end_date,
-        }
-        Getdialyzer(params).then(response =>{
-          console.log('ressponse',response.data.data);
-          if(response.data.state ==1){
-            console.log('bbbbbbbbb',response.data.data);
-            const list = response.data.data.data
-            const xAxis =[]
-            const yAxis = []
-            list.forEach(item =>{
-
-              xAxis.push(item.name)
-              yAxis.push(item.count)
-            })
-            this.bar_xAxis = xAxis
-            const options = []
-            for(let i in xAxis){
-              const arr ={
-                id:i+1,
-                name:xAxis[i]
-              }
-              options.push(arr)
-            }
-            this.dialyze_options = options
-            const option = {
-              xAxis: {
-                type: 'category',
-                data: xAxis,
-                axisLabel:{
-                  interval:0,
-                }
-              },
-              yAxis: {
-                type: 'value'
-              },
-              series: [
-                {
-                  data:yAxis ,
-                  type: 'bar',
-                  barWidth: '25%',
-                  label: {
-                    normal: {
-                      show: true,
-                      position: 'top',
-                      formatter: '{c}',
-                      textStyle:{
-                        color: 'black',//字体颜色
-                        fontSize: 13//字体大小
-                      }
-                    },
-                  },
-                  itemStyle:{
-                    normal:{
-                      color:function (params){
-                        // const colorarr=['#FFA333','#A155E8','#6D91FF','#A233A2'];
-                        var colorarr = [["#A9E0F3", "#9FBDFC"],["#FFD7C0", "#FF9994"]]
-                        var index = params.dataIndex;
-                        if (params.dataIndex >= colorarr.length) {
-                          index = params.dataIndex % colorarr.length;
-                        }
-                        return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                          { offset: 0, color: colorarr[index][0] },
-                          // { offset: 0.5, color: colorList[index][1] },
-                          { offset: 1, color: colorarr[index][1] }
-                        ]);
-                      }
-                    }
-                  }
-                }
-              ]
-            }
-            myChart.setOption(option);
-            myChart.on('click',params =>{
-              this.dialyze_dialog = true
-              console.log('vvvvv',params);
-              this.Getdialyzerdetail(params.name)
-            })
-          }
-
-        })
-
-      },
       // 导出excel
       exportExcel(){
         let tableData = [
-          ['序号', '透析号', '患者姓名', '透析日期','透析模式', '透析器']//导出表头
+          ['序号', '透析号', '患者姓名','性别','年龄','透析日期','干体重','前次透后体重','透前体重','体重增加','透后体重',]//导出表头
         ]
         this.tableData.forEach((item,index) =>{
           let rowdata=[]
@@ -310,16 +228,23 @@ import html2canvas from "html2canvas"
             item.index,
             item.dialysis_no,
             item.name,
+            item.sex,
+            item.age,
             item.date,
-            item.mode_name,
-            item.dialyszers,
+
+            item.dry_weight,
+            item.last_weight_after,
+            item.weight_before,
+            item.weight_add,
+            item.weight_after
+
           ]
           tableData.push(rowdata)
         })
         let workSheet = XLSX.utils.aoa_to_sheet(tableData);
         let bookNew = XLSX.utils.book_new();
-        XLSX.utils.book_append_sheet(bookNew, workSheet, '透析器使用统计') // 工作簿名称
-        let name = '透析器使用统计'+ '.xlsx'
+        XLSX.utils.book_append_sheet(bookNew, workSheet, '患者体重详情') // 工作簿名称
+        let name = '患者体重详情'+ '.xlsx'
         XLSX.writeFile(bookNew, name) // 保存的文件名
       },
       // 查询
@@ -328,7 +253,7 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       deil_click(){
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        // this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
       },
        // 下载
       Download_click(){
@@ -422,32 +347,42 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(name){
-        const params={
-          dialyzer:name,
-          start_date:this.start_date,
-          end_date:this.end_date,
+      Getdialyzerdetail(){
+        const params ={
+          start_time:this.start_date,
+          end_time:this.end_date,
+          add_type:this.weight_value,
+          dry_type:this.dry_value,
+          after_type:this.after_value,
+          keyword:this.Patient_name,
           page:this.currentPage,
           limit:this.limit,
         }
-        Getdialyzerdetail(params).then(response =>{
+        Getweightdetail(params).then(response =>{
           if(response.data.state == 1){
-            const list = response.data.data.prescriptions
+            console.log('体重详情分析',response.data.data);
+            const list = response.data.data.list
             const table=[]
-            list.forEach((item,index)=>{
-              const obj ={
-                index:index+1,
-                dialysis_no:item.patient.dialysis_no,
-                name:item.patient.name,
-                date:this.getTime(item.record_date),
-                mode_name:this.getmode(item.mode_id),
-                dialyszers:item.dialysis_dialyszers +'  '+ item.dialysis_irrigation+'  '+item.dialysis_strainer
-                // dialyszers:item.dialysis_dialyszers || item.dialysis_irrigation || item.dialysis_strainer
-              }
-              table.push(obj)
-            })
-            this.tableData = table
-            this.total = response.data.data.total
+            if(list.length >0){
+              list.forEach((item,index)=>{
+                const obj ={
+                  index:index+1,
+                  dialysis_no:item.dialysis_no,
+                  name:item.patient_name,
+                  sex:this.getgender(item.gender),
+                  age:item.age,
+                  date:this.getTime(item.assessment_date),
+                  dry_weight:item.dry_weight,
+                  last_weight_after:item.last_weight_after,
+                  weight_before:item.weight_before,
+                  weight_add:item.weight_add,
+                  weight_after:item.weight_after
+                }
+                table.push(obj)
+              })
+              this.tableData = table
+              this.total = response.data.data.total
+            }
           }
           console.log('77777',response);
         })
@@ -554,19 +489,18 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        this.Getdialyzerdetail()
       },
       handleSizeChange(val){
         this.limit = val
-        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
+        this.Getdialyzerdetail()
       },
-      // 透析模式
-      getmode(ids){
-        const modes=this.modearr
-        for(let i in modes){
-          if(ids == modes[i].id){
-            return modes[i].name
-          }
+      // 性别
+      getgender(ids){
+        if(ids ==1){
+          return "男"
+        }else{
+          return "女"
         }
       },
        // 转换时间
@@ -591,12 +525,7 @@ import html2canvas from "html2canvas"
         }
         return new Blob([u8arr], { type: mime });
       },
-      // 全部透析器
-      Getdialyzerconfig(){
-        Getdialyzerconfig().then(response =>{
-          console.log('666666',response);
-        })
-      },
+
       getdialyze(val){
         const option = this.dialyze_options
         for(let i in option){
@@ -607,11 +536,11 @@ import html2canvas from "html2canvas"
       }
     },
     mounted(){
-      this.getecharts()
+
     },
     created(){
       this.start_date = this.getFirstDayOfMonth(new Date())
-      this.Getdialyzerconfig()
+      this.Getdialyzerdetail()
     },
 
   }

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -76,7 +76,7 @@
                         上机前病情:
                         <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
                         <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other!=''?true :false" showValue="症状:"></label-box>
-                        
+
                         <span>{{record.assessment_before_dislysis.symptom_before_dialysis_other}}</span>
                       </div>
                     </td>
@@ -87,7 +87,7 @@
                         {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : ""}}
                         mmHg
                       </div>
-                      
+
                     </td>
                   </tr>
 
@@ -148,7 +148,7 @@
                     <td colspan="3">
                       <div style="display: flex;">
                         <div style="flex: 1;">
-                          上次透后体重:{{ record.lastafterweight.weight_after ? 
+                          上次透后体重:{{ record.lastafterweight.weight_after ?
                           parseFloat( record.lastafterweight.weight_after).toFixed(1)
                           : '未称重'}}kg
                         </div>
@@ -189,7 +189,7 @@
                       <div style="line-height:30px;">
                       <span>目标脱水量: {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
                       <span>处方脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
-                      <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
+                      <!-- <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h -->
                       </div>
                     </td>
                     <td >
@@ -634,13 +634,14 @@
                 this.records[recordIndex].isShowZero = true
               }
 
+
               var delghTwo = 0
 
               if (
                 this.records[recordIndex].advices &&
                 this.records[recordIndex].advices.length < 10
               ) {
-                delghTwo = 10 - this.records[recordIndex].advices.length
+                delghTwo = 10 - (this.records[recordIndex].advices.length)
               } else {
                 delghTwo = 0
               }
@@ -660,7 +661,7 @@
                 }
               }
               console.log('his_advices',this.records[recordIndex].advices);
-              
+
               var childMap = {}
               for (const index in this.records[recordIndex].advices) {
                 if (this.records[recordIndex].advices[index].parent_id == 0) {
@@ -695,7 +696,7 @@
               }
               // advices = advices.concat(this.records[recordIndex].his_advices)
               console.log('advices',advices);
-              
+
               var leftAdvice = []
               var rightAdvice = []
               var adlen = advices.length

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2630,7 +2630,7 @@ mu
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
       
-        if(this.$store.getters.xt_user.template_info.org_id==10702){
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -1179,20 +1179,24 @@ export default {
           var projects = response.data.data.projects
           var newDocArr= []
           var projectarr = []
+          var projectArrs = []
           for(let i=0;i<advices.length;i++){
-            console.log("hhahahahh",advices[i].advice_name.indexOf("0.9%氯化钠注射液"))
-            console.log("jjjjjjjjj",advices[i].delivery_way.indexOf("管路预冲"))
+            // console.log("hhahahahh",advices[i].advice_name.indexOf("0.9%氯化钠注射液"))
+            // console.log("jjjjjjjjj",advices[i].delivery_way.indexOf("管路预冲"))
            if(advices[i].advice_name.indexOf("0.9%氯化钠注射液") ==-1 && advices[i].delivery_way.indexOf("管路预冲")==-1){
               newDocArr.push(advices[i])
            }
           }
           for(let i in projects){
             if(projects[i].type ==2){
-              projectarr.push(projects[i])
+              if(projects[i].project.project_name == '血透监测'){
+                console.log('血透监测',projects[i].advice_name);
+                projectarr.push(projects[i])
+              }
             }
           }
 
-          console.log("newDocArr----------------------",projectarr)
+          console.log("血透监测 != -1",projects)
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
           var tableAdvice = newDocArr.concat(doctorAdevieInfo);
           if(projectarr.length>0){

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -619,6 +619,7 @@
                   <td width="100">
                     <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : prescription.dialysate_formulation_name.indexOf('低钙') > -1 ? true : false" showValue="2.0"></label-box>
                     <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('高钾') > -1 ? true : false" showValue="2.5"></label-box>
+                    <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('钾3.0') > -1 ? true : false" showValue="3.0"></label-box>
                   </td>
                   <td width="10">)</td>
                   <td width="10">mmol/L</td>

src/xt_pages/org/orginfo.vue

@@ -390,6 +390,7 @@ import Neditor from '@/components/Neditor'
             GetOrgInfo().then(response=>{
                 var res = response.data;
                 if (res.state === 1) {
+                   
                     this.formloading = false;
                     this.form.org_name = res.data.orginfo.org_name;
                     this.form.contact_name = res.data.orginfo.contact_name;
@@ -411,11 +412,13 @@ import Neditor from '@/components/Neditor'
                     this.form.illness_list = [];
                     this.form.org_gallery = res.data.orginfo.org_gallery;
                     this.fileList = [];
-                    var gallery =  res.data.orginfo.gallery
+                    var gallery =  res.data.orginfo.org_gallery
+                    console.log("haaaaaaaaaaaaaaaaaa",gallery)
                     for (const index in gallery) {
                         var image = {id:gallery[index].id, name:gallery[index].id, url:gallery[index].type==1?gallery[index].url:gallery[index].url+'?vframe/jpg/offset/0/w/100/h/100'};
                         this.fileList.push(image);
                     }
+                    console.log("fileList-------------",fileList)
 
                     var illness = res.data.orginfo.illness.split(',');
                     for (const index in illness) {

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

@@ -40,9 +40,13 @@
                 <td style="width:25%">{{item.code}}</td>
                 <td style="width:25%">{{item.name}}</td>
                 <td style="width:15%">{{item.spec}}</td>
-                <td style="width:5%">{{item.count}}</td>
-                <td style="width:5%">{{item.unit}}</td>
-                <td style="width:8%">{{(item.price*1).toFixed(2)}}</td>
+                <td style="width:5%" >
+                  <span v-if="item.code!=undefined">{{item.count}}</span>
+                </td>
+                <td style="width:5%" >{{item.unit}}</td>
+                <td style="width:8%">
+                  <span v-if="item.code!=undefined">{{(item.price*1).toFixed(2)}}</span>
+                </td>
                 <td style="width:8%">{{(item.price * item.count).toFixed(2)}}</td>
                 <td style="width:8%" v-if="item.code!=undefined">
                   {{(item.selfpay_prop)*100}}

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -22,7 +22,7 @@
           org_id == 10028 ||
           org_id == 10278 ||
           org_id == 10610 ||
-          org_id==10537 ||  org_id == 0
+          org_id==10537 
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -70,17 +70,17 @@
       <printSixtheen :info="info" v-if="org_id == 10697"></printSixtheen>
 
       <printOne :info="info" v-if=" org_id != 9990 &&
-            org_id != 10138 &&
-            org_id != 9504 &&
-            org_id != 10028 &&
-            org_id != 0 &&   org_id != 10610 && org_id !=10537 && org_id !=10697 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 10633 &&org_id != 0  && this.paramsObj.balance_accounts_type == 1">
+            org_id != 10138 && org_id != 9504 && org_id != 10028 &&
+            org_id != 10610 && org_id !=10537 && org_id !=10697 &&
+            org_id != 10278 && org_id != 10387 && org_id != 10191 && 
+            org_id != 10210 &&org_id != 10485 &&org_id != 10480 && 
+            org_id != 10510 &&org_id != 10088 &&org_id != 10633 && this.paramsObj.balance_accounts_type == 1">
       </printOne>
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
-            org_id != 10138 &&
-            org_id != 9504 &&
-            org_id != 10028 && org_id !=10697 &&
-            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510 &&org_id != 10633 && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
+            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 && 
+            org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 && 
+            org_id != 10510 &&org_id != 10633 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
     </div>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -33,7 +33,8 @@
       </tr>
       <tr>
         <td width="70">就医登记号</td>
-        <td colspan="7">{{info.psn_no}}</td>
+        <td colspan="7" v-if="org_id !=10644">{{info.psn_no}}</td>
+        <td colspan="7" v-if="org_id ==10644">{{info.mdtrt_id}}</td>
         <td width="50">门诊号</td>
         <td colspan="3">{{info.number}}</td>
       </tr>
@@ -346,7 +347,13 @@
           return {}
         }
       }
-    },methods:{
+    },
+    data(){
+      return{
+        org_id:'',
+      }
+    },
+    methods:{
       getBirth(idNo){
         var year = idNo.substring(6, 10);
         var month = idNo.substring(10, 12);
@@ -382,6 +389,9 @@
         return dateTime
       },
 
+    },
+    created(){
+      this.org_id = this.$store.getters.xt_user.org_id
     }
   }
 

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -820,7 +820,8 @@ export default {
     this.first_dialysis_date = this.getTime(
       this.patientInfo.first_dialysis_date
     );
-   
+    
+    console.log("case_history-----------------------------",this.case_history)
     if(this.case_history!=undefined){
       if(this.case_history.id == 0){
         this.primary_disease = this.LastCaseHistory.primary_disease
@@ -893,7 +894,10 @@ export default {
         console.log("patient------------------------",this.patientInfo)
         console.log("prescriptionInfo--------------------",this.prescriptionInfo)
         console.log("this.diagnoses",this.diagnoses)
-        if(this.befor!=undefined){
+        console.log("this.case_history",this.case_history)
+        if(this.case_history!=null && this.case_history.id == 0){
+          console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
+          if(this.befor!=undefined){
           if(this.case_history.temperature == 0){
             this.case_history.temperature =  this.befor.temperature?this.befor.temperature:""
           }
@@ -925,7 +929,9 @@ export default {
                console.log("诊断---------------------",this.diagnoses)
               this.case_history.diagnose = this.getDiagnosis(this.prescriptionInfo.diagnosis) 
            }
+         }
         }
+      
       },
       deep: true,
     },

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -174,6 +174,8 @@
                     <p>HDF+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                     <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
+
+                 
                   <!-- <span v-if="item.mode_id == 'HFHD+HD'">
                       <p>HFHD+HD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
@@ -301,6 +303,16 @@
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
 
+                  <span v-if="item.mode_id == 'HD(无肝素)'">
+                    <p>HD(无肝素):{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                  <span v-if="item.mode_id == 'HDF17H'">
+                    <p>HDF17H:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
 
                </div>
               </div>
@@ -1105,6 +1117,12 @@ export default {
             if(modedate[i].mode_id == 39){
               modedate[i].mode_id = "HF16"
             }
+            if(modedate[i].mode_id == 40){
+                modedate[i].mode_id = "HD(无肝素)"
+            }
+            if(modedate[i].mode_id == 41){
+                modedate[i].mode_id = "HDF17H"
+            }
             this.modetype = modedate
 
             // this.modesData.xAxis.push(modedate[i].mode_id)

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -367,6 +367,12 @@ export default {
             if(modeIdCount[i].mode_id == 39){
               modeIdCount[i].mode_id = "HF16"
             }
+            if(modeIdCount[i].mode_id == 40){
+              modeIdCount[i].mode_id = "HD(无肝素)"
+            }
+            if(modeIdCount[i].mode_id == 41){
+              modeIdCount[i].mode_id = "HDF17H"
+            }
           }
           this.modeIdCount = modeIdCount
 
@@ -493,6 +499,12 @@ export default {
             if(scheduleCount[i].mode_id == 39){
               scheduleCount[i].mode_id = "HF16"
             }
+            if(scheduleCount[i].mode_id == 40){
+              scheduleCount[i].mode_id = "HD(无肝素)"
+            }
+            if(scheduleCount[i].mode_id == 41){
+              scheduleCount[i].mode_id = "HDF17H"
+            }
           }
           this.scheduleCount = scheduleCount
           let dataInfo = {}
@@ -703,6 +715,10 @@ export default {
           patients[i].mode_id = "HDF80"
         }else if(patients[i].mode_id == 39){
           patients[i].mode_id = "HF16"
+        }else if(patients[i].mode_id == 40){
+          patients[i].mode_id = "HD(无肝素)"
+        }else if(patients[i].mode_id == 41){
+          patients[i].mode_id = "HDF17H"
         }
         
 
@@ -783,13 +799,17 @@ export default {
          this.DialysisData[i].HDF80 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF80")
          this.DialysisData[i].HF16 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HF16")
 
+         this.DialysisData[i].HD无肝素 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD(无肝素)")
+
+         this.DialysisData[i].HDF17H = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF17H")
+
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
        }
        console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
 
@@ -838,13 +858,17 @@ export default {
          this.DialysisData[i].HDF80 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF80")
          this.DialysisData[i].HF16 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HF16")
 
+         this.DialysisData[i].HD无肝素 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD(无肝素)")
+
+          this.DialysisData[i].HDF17H = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF17H")
+
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getScheduleDialysisCount(this.DialysisData[i].patient_id)
        }
        console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
 
@@ -893,13 +917,15 @@ export default {
          this.scheduleList[i].HDF1000 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF1000")
          this.scheduleList[i].HDF80 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF80")
          this.scheduleList[i].HF16 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HF16")
+         this.scheduleList[i].HD无肝素 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD(无肝素)")
+         this.scheduleList[i].HDF17H = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF17H")
          this.scheduleList[i].age = this.getAge(this.scheduleList[i].id_card_no)
          this.scheduleList[i].total_count = this.getScheduleDialysisCount(this.scheduleList[i].patient_id)
        }
        console.log("hhh2323323232",this.scheduleList)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','','HDF80','HF16','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','','HDF80','HF16','HD无肝素','HDF17H','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','total_count']
 
         const data = this.formatJson(filterVal, this.scheduleList)
 

src/xt_pages/user/components/PatientSidebar.vue

@@ -190,10 +190,10 @@ export default {
               name: '1-3',
               label: '肾科检验'
             },
-            {
-              name: '4-12',
-              label: '新版肾科检验'
-            },
+            // {
+            //   name: '4-12',
+            //   label: '新版肾科检验'
+            // },
             {
               name: '4-1',
               label: '肾科检查'