修改

src/api/common/common.js

@@ -149,6 +149,7 @@ export function getTotalLapseCount(startime, endtime) {
     startime: startime,
     endtime: endtime
   }
+
   return request({
     url: '/com/api/gettotallapsecount',
     method: 'get',
@@ -257,14 +258,15 @@ export function getDialysisDetailById(id, startime, endtime, limit, page) {
   })
 }
 
-export function getPrescriptionByName(keyword, startime, endtime, limit, page) {
+export function getPrescriptionByName(patientid, startime, endtime, limit, page) {
   const params = {
-    keyword: keyword,
+    patientid: patientid,
     startime: startime,
     endtime: endtime,
     limit: limit,
     page: page
   }
+  console.log('params', params)
   return request({
     url: '/com/api/getprescriptionbyname',
     method: 'Get',
@@ -298,7 +300,6 @@ export function getInspectionDetailById(id, startime, endtime) {
     startime: startime,
     endtime: endtime
   }
-  console.log('startime', params)
   return request({
     url: '/com/api/getinspectionDetailById',
     method: 'get',
@@ -306,9 +307,9 @@ export function getInspectionDetailById(id, startime, endtime) {
   })
 }
 
-export function getSearchPatientInfo(keyword, startime, endtime) {
+export function getSearchPatientInfo(patientid, startime, endtime) {
   const params = {
-    keyword: keyword,
+    patientid: patientid,
     startime: startime,
     endtime: endtime
   }
@@ -376,12 +377,7 @@ export function getNormData(params) {
   })
 }
 
-export function getFirstQuarter(lapseto, startime, endtime) {
-  const params = {
-    lapseto: lapseto,
-    startime: startime,
-    endtime: endtime
-  }
+export function getFirstQuarter(params) {
   console.log('params', params)
   return request({
     url: '/com/api/getfirstquarter',
@@ -391,7 +387,6 @@ export function getFirstQuarter(lapseto, startime, endtime) {
 }
 
 export function getProjectList(params) {
-  console.log('params', params)
   return request({
     url: '/com/api/getprojectlist',
     method: 'get',
@@ -423,3 +418,51 @@ export function getPatientsControl(lapstor, startime, endtime, page, limit) {
   })
 }
 
+export function getCartogramlist(lapsetor, startime, endtime, limit, page) {
+  const params = {
+    lapsetor: lapsetor,
+    startime: startime,
+    endtime: endtime,
+    limit: limit,
+    page: page
+  }
+
+  return request({
+    url: '/com/api/getcartogramlist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPatientContorlAnalysis(params) {
+  return request({
+    url: '/com/api/getpatientcontor',
+    method: 'get',
+    params: params
+  })
+}
+
+export function GetQualityControl(params) {
+  console.log('params', params)
+  return request({
+    url: '/com/api/getqualitycontrol',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getTreatlist(params) {
+  return request({
+    url: '/com/api/gettreatlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getPatientComplianceDetail(params) {
+  return request({
+    url: '/com/api/getpatientcompliancedetal',
+    method: 'Get',
+    params: params
+  })
+}

src/api/common/statistics.js

@@ -153,5 +153,74 @@ export function GetDefalutPatient() {
 
 
 
+export function GetInspectionIndexInit() {
+  return request({
+    url: '/api/inspectionindex/init',
+    method: 'get',
+  })
+}
+
+
+export function GetRangeValue(params) {
+  return request({
+    url: '/api/rangevalue/get',
+    method: 'get',
+    params:params,
+
+  })
+}
+
+
+
+export function GetInspectionIndexChart(params) {
+  return request({
+    url: '/api/inspectionindex/chart',
+    method: 'get',
+    params:params,
+
+  })
+}
+
+export function GetInspectionIndexTable(params) {
+  return request({
+    url: '/api/inspectionindex/table',
+    method: 'get',
+    params:params,
+
+  })
+}
+
+export function GetPatientInspectionIndexChart(params) {
+  return request({
+    url: '/api/patientinspectionindex/chart',
+    method: 'get',
+    params:params,
+
+  })
+}
+
+export function GetPatientInspectionIndexBarChart(params) {
+  return request({
+    url: '/api/patientinspectionindex/barchart',
+    method: 'get',
+    params:params,
+
+  })
+}
+
+
+
+export function GetDefaultPatient() {
+  return request({
+    url: '/api/defalutpatient/get',
+    method: 'get',
+
+  })
+}
+
+
+
+
+
 
 

src/api/patient.js

@@ -36,7 +36,6 @@ export function createPatient(patient) {
   })
 }
 export function editPatient(id, patient) {
-  console.log('patient', patient)
   return request({
     url: '/api/patients/edit?id=' + id + '&record_date=' + patient.record_date + '&is_infectious=' + patient.is_infectious + '&remind_cycle=' + patient.remind_cycle,
     method: 'put',
@@ -238,6 +237,7 @@ export function deleteRescueRecords(patient_id, ids_str) {
 }
 
 export function EditLapseto(patient_id, data) {
+  console.log('data', data)
   return request({
     url: '/api/patients/lapseto/edit?id=' + patient_id,
     method: 'post',
@@ -345,28 +345,18 @@ export function getAllData(id, page, limit) {
   })
 }
 
-
 export function postExportPatients(params) {
   return request({
     url: '/api/patients/export',
     method: 'Post',
-    data: params,
+    data: params
   })
 }
 
-
-
 export function getMaxDialysisNo() {
   return request({
     url: '/api/patients/dialysis_no',
-    method: 'Get',
+    method: 'Get'
   })
 }
 
-
-
-
-
-
-
-

src/api/signandweigh.js

@@ -1,8 +1,6 @@
 import request from '@/utils/request'
 
 export function fetchSignPatients(params) {
-  console.log('bbbbbbbbbbbbbbb号码')
-  console.log(params)
   return request({
     url: '/api/sign/patients',
     method: 'Get',
@@ -64,8 +62,6 @@ export function editdata(params) {
 }
 
 export function sighdata(params) {
-  console.log('好还哦')
-  console.log(params)
   return request({
     url: '/api/sigh/sighdata',
     params: params,
@@ -74,7 +70,6 @@ export function sighdata(params) {
 }
 
 export function updateSignweight(params) {
-  console.log('params是什么', params)
   return request({
     url: '/api/sign/updateSignweight',
     params: params,

src/router/index_路由未分离前.js

@@ -895,7 +895,7 @@ export const xt_asyncRouterMap = [
     redirect: '/qcd/dialysistotal',
     name: 'qcd',
     alwaysShow: true,
-    meta: { title: '科室质控', icon: 'table' },
+    meta: { title: '质控管理', icon: 'table' },
     children: [
       { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
       { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},

src/router/modules/dialysis.js

@@ -1,62 +1,62 @@
-import Layout from "@/views/layout/Layout";
+import Layout from '@/views/layout/Layout'
 
 export default {
-  path: "/dialysis/",
+  path: '/dialysis/',
   component: Layout,
-  redirect: "noredirect",
-  name: "dialysis",
+  redirect: 'noredirect',
+  name: 'dialysis',
   alwaysShow: true,
   meta: {
-    title: "dialysis",
-    icon: "touxi"
+    title: 'dialysis',
+    icon: 'touxi'
   },
   children: [
     {
-      path: "/dialysis/dialysisrecord",
-      component: () => import("@/xt_pages/dialysis/schedualPatient"),
-      name: "透析记录",
+      path: '/dialysis/dialysisrecord',
+      component: () => import('@/xt_pages/dialysis/schedualPatient'),
+      name: '透析记录',
       meta: {
-        title: "透析记录",
+        title: '透析记录',
         noCache: true
       }
     },
     {
-      path: "/dialysis/watch",
-      component: () => import("@/xt_pages/dialysis/bloodPresssWatch"),
-      name: "watch",
+      path: '/dialysis/watch',
+      component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),
+      name: 'watch',
       meta: {
-        title: "watch",
+        title: 'watch',
         noCache: true
       }
     },
     {
-      path: "/dialysis/board",
-      component: () => import("@/xt_pages/dialysis/bulletinBoard"),
-      name: "数据看板",
+      path: '/dialysis/board',
+      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
+      name: '数据看板',
       meta: {
-        title: "数据看板",
+        title: '数据看板',
         noCache: true
       }
     },
     {
-      path: "/dialysis/record/:id",
-      component: () => import("@/xt_pages/dialysis/dialysisPage"),
+      path: '/dialysis/record/:id',
+      component: () => import('@/xt_pages/dialysis/dialysisPage'),
       hidden: true,
       is_menu: false,
-      name: "paper",
+      name: 'paper',
       meta: {
-        title: "paper",
+        title: 'paper',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print",
-      component: () => import("@/xt_pages/dialysis/dialysisPrintOrder"),
+      path: '/dialysis/print',
+      component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
       hidden: true,
       is_menu: false,
-      name: "dialysisPrintOrder",
+      name: 'dialysisPrintOrder',
       meta: {
-        title: "dialysisPrintOrder",
+        title: 'dialysisPrintOrder',
         noCache: true
       }
     },
@@ -65,195 +65,207 @@ export default {
     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
 
     {
-      path: "/dialysis/details",
-      component: () => import("@/xt_pages/dialysis/details"),
-      name: "details",
+      path: '/dialysis/details',
+      component: () => import('@/xt_pages/dialysis/details'),
+      name: 'details',
       meta: {
-        title: "details"
+        title: 'details'
       },
       hidden: true,
       is_menu: false,
       noCache: true
     },
     {
-      path: "/dialysis/print/batch",
+      path: '/dialysis/print/batch',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print",
+      name: 'dialysis_batch_print',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/other",
+      path: '/dialysis/print/batch/other',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_other"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_other'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print_two",
+      name: 'dialysis_batch_print_two',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/three",
+      path: '/dialysis/print/batch/three',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_three"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_three'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print_two_one",
+      name: 'dialysis_batch_print_two_one',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/four",
+      path: '/dialysis/print/batch/four',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_four"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_four'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print_two_one",
+      name: 'dialysis_batch_print_two_one',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/five",
+      path: '/dialysis/print/batch/five',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_five"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_five'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print_two_one",
+      name: 'dialysis_batch_print_two_one',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/six",
+      path: '/dialysis/print/batch/six',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_six"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_six'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_six",
+      name: 'dialysis_batch_six',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/seven",
+      path: '/dialysis/print/batch/seven',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_seven"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seven'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_seven",
+      name: 'dialysis_batch_seven',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/eight",
+      path: '/dialysis/print/batch/eight',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_eight"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_eight'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_eight",
+      name: 'dialysis_batch_eight',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/nine",
+      path: '/dialysis/print/batch/nine',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_nine"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_nine'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_nine",
+      name: 'dialysis_batch_nine',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/twelve",
+      path: '/dialysis/print/batch/twelve',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_twelve"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_twelve'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_twelve",
+      name: 'dialysis_batch_twelve',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/thirteen",
+      path: '/dialysis/print/batch/thirteen',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_thirteen"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirteen'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_thirteen",
+      name: 'dialysis_batch_thirteen',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/otherone",
+      path: '/dialysis/print/batch/fifteen',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_other_one"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fifteen'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print_two_one",
+      name: 'dialysis_batch_fifteen',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/othertwo",
+      path: '/dialysis/print/batch/otherone',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_other_two"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_other_one'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print_two_two",
+      name: 'dialysis_batch_print_two_one',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/fiveone",
+      path: '/dialysis/print/batch/othertwo',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_five_one"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_other_two'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print_two_two",
+      name: 'dialysis_batch_print_two_two',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
         noCache: true
       }
     },
     {
-      path: "/dialysis/print/batch/fivetwo",
+      path: '/dialysis/print/batch/fiveone',
       component: () =>
-        import("@/xt_pages/dialysis/batch_print/batch_print_order_five_two"),
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_five_one'),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_print_two_two",
+      name: 'dialysis_batch_print_two_two',
       meta: {
-        title: "批量打印",
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/fivetwo',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_five_two'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_print_two_two',
+      meta: {
+        title: '批量打印',
         noCache: true
       }
     }
   ]
-};
+}

src/router/modules/qcd.js

@@ -1,14 +1,14 @@
-import Layout from "@/views/layout/Layout";
+import Layout from '@/views/layout/Layout'
 
 export default {
-  path: "/qcd",
+  path: '/qcd',
   component: Layout,
-  redirect: "/qcd/dialysistotal",
-  name: "qcd",
+  redirect: '/qcd/dialysistotal',
+  name: 'qcd',
   alwaysShow: true,
   meta: {
-    title: "质控管理",
-    icon: "statistics"
+    title: '质控管理',
+    icon: 'statistics'
   },
   children: [
     // {
@@ -68,333 +68,343 @@ export default {
     //   }
     // },
     {
-      path: "/qcd/patientanalysis/statisticalConfig",
-      component: () => import("@/xt_pages/qcd/statisticalConfiguration"),
-      name: "statisticalConfig",
+      path: '/qcd/patientanalysis/statisticalConfig',
+      component: () => import('@/xt_pages/qcd/statisticalConfiguration'),
+      name: 'statisticalConfig',
       meta: {
-        title: "统计配置",
+        title: '统计配置',
         noCache: true
       }
     },
     {
-      path: "/qcd/basicInformationAnalysis",
-      component: () => import("@/xt_pages/qcd/basicInformationAnalysis"),
-      name: "basicInformationAnalysis",
+      path: '/qcd/basicInformationAnalysis',
+      component: () => import('@/xt_pages/qcd/basicInformationAnalysis'),
+      name: 'basicInformationAnalysis',
       meta: {
-        title: "基本信息统计",
+        title: '基本信息统计',
         noCache: true
       }
     },
     {
-      path: "/qcd/officesControlAnalysis/time",
-      component: () => import("@/xt_pages/qcd/officesControlAnalysis/time"),
-      name: "officesControlAnalysis",
+      path: '/qcd/officesControlAnalysis/time',
+      component: () => import('@/xt_pages/qcd/officesControlAnalysis/time'),
+      name: 'officesControlAnalysis',
       meta: {
-        title: "科室质控达标统计",
+        title: '科室质控达标统计',
         noCache: true
       }
     },
     {
-      path: "/qcd/officesControlAnalysis/project",
+      path: '/qcd/officesControlAnalysis/project',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/officesControlAnalysis/project"),
-      name: "patientControlAnalysisProject",
+      component: () => import('@/xt_pages/qcd/officesControlAnalysis/project'),
+      name: 'patientControlAnalysisProject',
       meta: {
-        title: "科室质控达标统计按项目",
+        title: '科室质控达标统计按项目',
         noCache: true
       }
     },
     {
-      path: "/qcd/patientControlAnalysis",
-      component: () => import("@/xt_pages/qcd/patientControlAnalysis"),
-      name: "patientControlAnalysisTime",
+      path: '/qcd/patientControlAnalysis',
+      component: () => import('@/xt_pages/qcd/patientControlAnalysis'),
+      name: 'patientControlAnalysisTime',
       meta: {
-        title: "患者质控达标统计",
+        title: '患者质控达标统计',
         noCache: true
       }
     },
     {
-      path: "/qcd/patientComplianceDetails",
+      path: '/qcd/patientComplianceDetails',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/patientComplianceDetails"),
-      name: "patientComplianceDetails",
+      component: () => import('@/xt_pages/qcd/patientComplianceDetails'),
+      name: 'patientComplianceDetails',
       meta: {
-        title: "患者质控达标统计详情",
+        title: '患者质控达标统计详情',
         noCache: true
       }
     },
 
     {
-      path: "/qcd/treatmentControlAnalysis/time",
-      component: () => import("@/xt_pages/qcd/treatmentControlAnalysis/time"),
-      name: "treatmentControlAnalysis",
+      path: '/qcd/treatmentControlAnalysis/time',
+      component: () => import('@/xt_pages/qcd/treatmentControlAnalysis/time'),
+      name: 'treatmentControlAnalysis',
       meta: {
-        title: "治疗信息统计",
+        title: '治疗信息统计',
         noCache: true
       }
     },
     {
-      path: "/qcd/treatmentControlAnalysis/check",
+      path: '/qcd/treatmentControlAnalysis/check',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/treatmentControlAnalysis/check"),
-      name: "treatmentControlAnalysisCheck",
+      component: () => import('@/xt_pages/qcd/treatmentControlAnalysis/check'),
+      name: 'treatmentControlAnalysisCheck',
       meta: {
-        title: "治疗信息统计检验检查",
+        title: '治疗信息统计检验检查',
         noCache: true
       }
     },
     {
-      path: "/qcd/indicatorControlAnalysis/analysis",
+      path: '/qcd/indicatorControlAnalysis/analysis',
       component: () =>
-        import("@/xt_pages/qcd/indicatorControlAnalysis/analysis"),
-      name: "indicatorControlAnalysis",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/analysis'),
+      name: 'indicatorControlAnalysis',
       meta: {
-        title: "指标评估统计",
+        title: '指标评估统计',
         noCache: true
       }
     },
     {
-      path: "/qcd/indicatorControlAnalysis/process",
+      path: '/qcd/indicatorControlAnalysis/process',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/indicatorControlAnalysis/process"),
-      name: "process",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/process'),
+      name: 'process',
       meta: {
-        title: "指标评估统计透析过程",
+        title: '指标评估统计透析过程',
         noCache: true
       }
     },
     {
-      path: "/qcd/indicatorControlAnalysis/monitor",
+      path: '/qcd/indicatorControlAnalysis/monitor',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/indicatorControlAnalysis/monitor"),
-      name: "monitor",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/monitor'),
+      name: 'monitor',
       meta: {
-        title: "指标评估统计透析监测",
+        title: '指标评估统计透析监测',
         noCache: true
       }
     },
     {
-      path: "/qcd/indicatorControlAnalysis/bloodPressure",
+      path: '/qcd/indicatorControlAnalysis/bloodPressure',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/indicatorControlAnalysis/bloodPressure"),
-      name: "bloodPressure",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/bloodPressure'),
+      name: 'bloodPressure',
       meta: {
-        title: "指标评估统计血压",
+        title: '指标评估统计血压',
         noCache: true
       }
     },
     {
-      path: "/qcd/indicatorControlAnalysis/bloodPressureDetails",
+      path: '/qcd/indicatorControlAnalysis/bloodPressureDetails',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails"),
-      name: "bloodPressureDetails",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails'),
+      name: 'bloodPressureDetails',
       meta: {
-        title: "指标评估统计血压详情",
+        title: '指标评估统计血压详情',
         noCache: true
       }
     },
     {
-      path: "/qcd/indicatorControlAnalysis/weight",
+      path: '/qcd/indicatorControlAnalysis/weight',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/indicatorControlAnalysis/weight"),
-      name: "weight",
+      component: () => import('@/xt_pages/qcd/indicatorControlAnalysis/weight'),
+      name: 'weight',
       meta: {
-        title: "指标评估体重",
+        title: '指标评估体重',
         noCache: true
       }
     },
     {
-      path: "/qcd/indicatorControlAnalysis/weightDetails",
+      path: '/qcd/indicatorControlAnalysis/weightDetails',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/indicatorControlAnalysis/weightDetails"),
-      name: "weightDetails",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/weightDetails'),
+      name: 'weightDetails',
       meta: {
-        title: "指标评估体重详情",
-        noCache: true
+        title: '指标评估体重详情',
+
       }
     },
     {
-      path: "/qcd/analysisDetails",
+      path: '/qcd/analysisDetails',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/indicatorControlAnalysis/analysisDetails"),
-      name: "analysisDetails",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/analysisDetails'),
+      name: 'analysisDetails',
       meta: {
-        title: "化验指标评估统计详情",
+        title: '化验指标评估统计详情',
         noCache: true
       }
     },
     {
-      path: "/qcd/workAnalysis/doctor",
-      component: () => import("@/xt_pages/qcd/workAnalysis/doctor"),
-      name: "workAnalysisDoctor",
+      path: '/qcd/workAnalysis/doctor',
+      component: () => import('@/xt_pages/qcd/workAnalysis/doctor'),
+      name: 'workAnalysisDoctor',
       meta: {
-        title: "工作量分析统计",
+        title: '工作量分析统计',
         noCache: true
       }
     },
     {
-      path: "/qcd/workAnalysis/nurse",
+      path: '/qcd/workAnalysis/nurse',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/workAnalysis/nurse"),
-      name: "workAnalysisNurse",
+      component: () => import('@/xt_pages/qcd/workAnalysis/nurse'),
+      name: 'workAnalysisNurse',
       meta: {
-        title: "工作量分析统计护士",
+        title: '工作量分析统计护士',
         noCache: true
       }
     },
-
     {
-      path: "/qcd/patientanalysis/checkStatistical",
+      path: '/qcd/patientanalysis/checkStatistical',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/checkStatistical"),
-      name: "checkStatistical",
+      component: () => import('@/xt_pages/qcd/checkStatistical'),
+      name: 'checkStatistical',
       meta: {
-        title: "检验检查统计配置",
+        title: '检验检查统计配置',
         noCache: true
       }
     },
     {
-      path: "/qcd/patientanalysis/weight",
+      path: '/qcd/patientanalysis/weight',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/patientAnalysis/weight"),
-      name: "patientAnalysisWeight",
+      component: () => import('@/xt_pages/qcd/patientAnalysis/weight'),
+      name: 'patientAnalysisWeight',
       meta: {
-        title: "体重分析",
+        title: '体重分析',
         noCache: true
       }
     },
     {
-      path: "/qcd/patientanalysis/bloodpressure",
+      path: '/qcd/patientanalysis/bloodpressure',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/patientAnalysis/bloodPressure"),
-      name: "patientAnalysisBloodPressure",
+      component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'),
+      name: 'patientAnalysisBloodPressure',
       meta: {
-        title: "血压分析",
+        title: '血压分析',
         noCache: true
       }
     },
     {
-      path: "/qcd/patientanalysis/dialysisage",
+      path: '/qcd/patientanalysis/dialysisage',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/patientAnalysis/dialysisAge"),
-      name: "patientAnalysisDialysisAge",
+      component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'),
+      name: 'patientAnalysisDialysisAge',
       meta: {
-        title: "透析龄分析",
+        title: '透析龄分析',
         noCache: true
       }
     },
     {
-      path: "/qcd/patientanalysis/lapseto",
+      path: '/qcd/patientanalysis/lapseto',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/patientAnalysis/lapseto"),
-      name: "patientAnalysisLapseto",
+      component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'),
+      name: 'patientAnalysisLapseto',
       meta: {
-        title: "转归分析",
+        title: '转归分析',
         noCache: true
       }
     },
     {
-      path: "/qcd/patientanalysis/complication",
+      path: '/qcd/patientanalysis/complication',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/patientAnalysis/complication"),
-      name: "patientAnalysisComplication",
+      component: () => import('@/xt_pages/qcd/patientAnalysis/complication'),
+      name: 'patientAnalysisComplication',
       meta: {
-        title: "并发症分析",
+        title: '并发症分析',
         noCache: true
       }
     },
     {
-      path: "/qcd/patientanalysis/infectiousdiseases",
+      path: '/qcd/patientanalysis/infectiousdiseases',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/patientAnalysis/infectiousDiseases"),
-      name: "patientAnalysisInfectiousDiseases",
+        import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'),
+      name: 'patientAnalysisInfectiousDiseases',
       meta: {
-        title: "传染病分析",
+        title: '传染病分析',
         noCache: true
       }
     },
     {
-      path: "/qcd/pa/person/lapseto",
+      path: '/qcd/pa/person/lapseto',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/patientAnalysis/person/lapseto"),
-      name: "paPersonLapseto",
+      component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'),
+      name: 'paPersonLapseto',
       meta: {
-        title: "转归",
+        title: '转归',
         noCache: true
       }
     },
     {
-      path: "/qcd/pa/person/weight",
+      path: '/qcd/pa/person/weight',
       hidden: true,
       is_menu: false,
-      component: () => import("@/xt_pages/qcd/patientAnalysis/person/weight"),
-      name: "paPersonWeight",
+      component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'),
+      name: 'paPersonWeight',
       meta: {
-        title: "体重",
+        title: '体重',
         noCache: true
       }
     },
     {
-      path: "/qcd/pa/person/bloodpressure",
+      path: '/qcd/pa/person/bloodpressure',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/patientAnalysis/person/bloodPressure"),
-      name: "paPersonBloodPressure",
+        import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'),
+      name: 'paPersonBloodPressure',
       meta: {
-        title: "血压",
+        title: '血压',
         noCache: true
       }
     },
     {
-      path: "/qcd/pa/person/indicators",
+      path: '/qcd/pa/person/indicators',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/patientAnalysis/person/indicators"),
-      name: "paPersonIndicators",
+        import('@/xt_pages/qcd/patientAnalysis/person/indicators'),
+      name: 'paPersonIndicators',
       meta: {
-        title: "指标控制",
+        title: '指标控制',
         noCache: true
       }
     },
     {
-      path: "/qcd/pa/person/oralmedicine",
+      path: '/qcd/pa/person/oralmedicine',
+      hidden: true,
+      is_menu: false,
+      component: () =>
+        import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'),
+      name: 'paPersonOralMedicine',
+      meta: {
+        title: '口服药',
+        noCache: true
+      }
+    }, {
+      path: '/qcd/inspection/detail',
       hidden: true,
       is_menu: false,
       component: () =>
-        import("@/xt_pages/qcd/patientAnalysis/person/oralMedicine"),
-      name: "paPersonOralMedicine",
+        import('@/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail'),
+      name: 'patientInspectionDetail',
       meta: {
-        title: "口服药",
+        title: '化验指标详情',
         noCache: true
       }
     }
   ]
-};
+}

src/store/modules/globalConfig.js

@@ -528,6 +528,21 @@ const global_config = {
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },
+      3: {
+        id: 7,
+        name: '低分子肝素',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
       4: {
         id: 4,
         name: '阿加曲班',
@@ -1268,6 +1283,9 @@ const global_config = {
     {
       id: 3,
       name: '住院'
+    }, {
+      id: 4,
+      name: '门诊'
     }
     ],
     observation_content: [{
@@ -2178,9 +2196,7 @@ const global_config = {
       state.patient_types = patientTypes
     }
   },
-  action: {
-
-  }
+  action: {}
 }
 
 export default global_config

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -150,6 +150,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 15">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -655,6 +665,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/twelve" });
       } else if (this.template_id == 13) {
         this.$router.push({ path: "/dialysis/print/batch/thirteen" });
+      }else if (this.template_id == 15) {
+        this.$router.push({ path: "/dialysis/print/batch/fifteen" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -321,7 +321,7 @@
       this.postures = getDataConfig('hemodialysis', 'posture')
       this.sick_condition = getDataConfig('hemodialysis', 'sick_condition')
       this.precautions = getDataConfig('hemodialysis', 'precaution')
-      console.log("跌倒预防措施",this.precautions)
+      //console.log("跌倒预防措施",this.precautions)
       this.intake = getDataConfig('hemodialysis', 'intake')
       this.nutrition = getDataConfig('hemodialysis', 'nutrition')
       console.log(this.ways)

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -433,6 +433,9 @@ export default {
         case 3:
           return "住院";
           break;
+        case 4:
+          return "门诊";
+          break;
 
         default:
           return "-";

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -170,6 +170,8 @@
           >打印</el-button
         >
       </template>
+
+      
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
@@ -259,6 +261,18 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 15"
       ></DialysisPrintOrderFifteen>
+      <DialysisPrintOrderSixteen
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 16"
+      ></DialysisPrintOrderSixteen>
+      <DialysisPrintOrderSeventeen
+         v-bind:childResponse="childResponse"
+         v-if="org_template_info.template_id == 17"
+      ></DialysisPrintOrderSeventeen>
+      <DialysisPrintOrderEighteen
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 18"
+      ></DialysisPrintOrderEighteen>
     </div>
   </div>
 </template>
@@ -284,7 +298,9 @@ import DialysisPrintOrderEleven from "./template/DialysisPrintOrderEleven";
 import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
 import DialysisPrintOrderThirteen from "./template/DialysisPrintOrderThirteen";
 import DialysisPrintOrderFifteen from "./template/DialysisPrintOrderFifteen";
-
+import DialysisPrintOrderSixteen from "./template/DialysisPrintOrderSixteen";
+import DialysisPrintOrderSeventeen from "./template/DialysisPrintOrderSeventeen";
+import DialysisPrintOrderEighteen from "./template/DialysisPrintOrderEighteen";
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -302,6 +318,9 @@ export default {
     DialysisPrintOrderSeven,
     DialysisPrintOrderEight,
     DialysisPrintOrderNine,
+    DialysisPrintOrderSixteen,
+    DialysisPrintOrderSeventeen,
+    DialysisPrintOrderEighteen,
     LabelBox,
     BreadCrumb
   },
@@ -531,6 +550,27 @@ export default {
           style: style,
           scanStyles: false
         });
+      }else if (this.org_template_info.template_id == 16){
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+      }else if (this.org_template_info.template_id == 17) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+      }else if (this.org_template_info.template_id == 18) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -18,9 +18,6 @@
             >{{ item.label }}</li>
           </ul>
         </div>
-        <label class="title">
-          <span class="name">日期查询</span> :
-        </label>
         <el-date-picker
           v-model="listQuery.start_time"
           prefix-icon="el-icon-date"
@@ -32,6 +29,7 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
         ></el-date-picker>
         <span class>-</span>
         <el-date-picker
@@ -45,6 +43,7 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
         ></el-date-picker>
       </div>
       <div class="cell clearfix" style="align-items:normal">
@@ -114,6 +113,22 @@
                       <p>腹水回输:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
+                   <span v-if="item.mode_id == 15">
+                      <p>HD前置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                   </span>
+                    <span v-if="item.mode_id == 16">
+                      <p>HD后置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                   </span>
+                    <span v-if="item.mode_id == 17">
+                      <p>HDF前置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                   </span>
+                    <span v-if="item.mode_id == 18">
+                      <p>HDF后置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                   </span>
                    <span v-if="item.mode_id == 19">
                       <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
@@ -149,8 +164,8 @@
                       <el-progress :percentage="(item.count/InfectiousTotal*100).toFixed(1)"></el-progress>
                   </span>
                     <span v-if="item.disease_id == 1">
-                      <p>其他:{{item.count + otherTotal}}人({{((item.count+otherTotal)/InfectiousTotal*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="((item.count+otherTotal)/InfectiousTotal*100).toFixed(1)"></el-progress>
+                      <p>其他:{{item.count}}人({{((item.count)/InfectiousTotal*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="((item.count)/InfectiousTotal*100).toFixed(1)"></el-progress>
                   </span>
                 </div>
               </div>
@@ -165,10 +180,10 @@
                 <p class="infoTitle">转归统计(总人数{{patientCount}}人)</p>
               </div>
               <div class="borderBox1">
-                <p>留治:{{RetentionCount}}人({{(RetentionCount/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(RetentionCount/patientCount*100).toFixed(1)"></el-progress>
-                <p>转出:{{rollOut}}人({{(rollOut/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(rollOut/patientCount*100).toFixed(1)"></el-progress>
+                <p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
+                <p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
               </div>
             </div>
             <div class="infoOne">
@@ -219,14 +234,24 @@
                 <p class="infoTitle">透龄统计</p>
               </div>
               <div class="borderBox1">
-                <p>透析龄≤12:{{totalone}}人({{(totalone/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(totalone/patientCount*100).toFixed(1)"></el-progress>
-                <p>12&lt;透析龄≤36:{{totaltwo}}人({{(totaltwo/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(totaltwo/patientCount*100).toFixed(1)"></el-progress>
-                <p>36≤透析龄≤60:{{totalthree}}/人({{(totalthree/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(totalthree/patientCount*100).toFixed(1)"></el-progress>
-                <p>透析龄 ≥60:{{patientCount-totalone-totaltwo-totalthree}}人({{((patientCount-totalone-totaltwo-totalthree)/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="((patientCount-totalone-totaltwo-totalthree)/patientCount*100).toFixed(1)"></el-progress>
+                <div v-for="(item,index) in dialysisAge" :key="index">
+                 <span v-if="item.age== 1">
+                  <p>透析龄≤12:{{item.count}}人({{(item.count/patientCount*100).toFixed(1)}}%)</p>
+                  <el-progress :percentage="(item.count/patientCount*100).toFixed(1)"></el-progress>
+                </span>
+                <span v-if="item.age == 2">
+                  <p>12&lt;透析龄≤36:{{item.count}}人({{(item.count/patientCount*100).toFixed(1)}}%)</p>
+                 <el-progress :percentage="(item.count/patientCount*100).toFixed(1)"></el-progress>
+                </span>
+                <span v-if="item.age == 3">
+                   <p>36≤透析龄≤60:{{item.count}}/人({{(item.count/patientCount*100).toFixed(1)}}%)</p>
+                   <el-progress :percentage="(item.count/patientCount*100).toFixed(1)"></el-progress>
+                </span>
+                <span v-if="item.age == 4">
+                   透析龄 ≥60:{{item.count}}人({{((item.count)/patientCount*100).toFixed(1)}}%)
+                   <el-progress :percentage="((item.count)/patientCount*100).toFixed(1)"></el-progress>
+                </span>
+               </div>
               </div>
             </div>
           </div>
@@ -253,8 +278,14 @@ export default {
   },
   data() {
     return {
+       pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      }, 
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "基本信息统计" }
       ],
       listQuery: {
@@ -268,7 +299,8 @@ export default {
         { value: 0, label: "本月", state: 0 },
         { value: 1, label: "近三个月", state: 1 },
         { value: 2, label: "近半年", state: 2 },
-        { value: 3, label: "近一年", state: 3 }
+        { value: 3, label: "近一年", state: 3 },
+        { value:4,label:"自定义",state:4}
       ],
       modetype:[],
       total:0,
@@ -286,6 +318,9 @@ export default {
       totalone:0,
       totaltwo:0,
       totalthree:0,
+      rollOutTotal:0,
+      outTotal:0,
+      dialysisAge:[],
     };
   },
   methods: {
@@ -294,6 +329,7 @@ export default {
       return new Date(time).getTime() / 1000;
     },
     changeTime(val) {
+       this.stateType = 4
        var timeStar=Date.parse(val)/1000
        var timeEnd =Date.parse(this.listQuery.end_time)/1000
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -316,6 +352,7 @@ export default {
       }
     },
     changeEndTime(val) {
+       this.stateType = 4
        var timeEnd=Date.parse(val)/1000
        var timeStar =Date.parse(this.listQuery.start_time)/1000
       var time =
@@ -343,7 +380,7 @@ export default {
       this.listQuery.state = state;
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
-      console.log("开始时间",startDate)
+    //  console.log("开始时间",startDate)
       const endDate = moment(new Date()).format('YYYY-MM-DD')
      // console.log("结束时间",endDate)
       var now = new Date()
@@ -443,63 +480,17 @@ export default {
         //统计透析年龄
         this.getTotalDialysisCount(startunitx,endunitx)
      }
+   
+ 
 
     },
     getDialysisModeType(startDate,endDate){
       getDialysisModeType(startDate,endDate).then(response=>{
          if(response.data.state == 1){
           var modetype =  response.data.data.modetype
-          console.log("mode---",modetype)
             var total =  response.data.data.total
             console.log("total",total)
             this.total = total
-           // for(let i=0;i<modetype.length;i++){
-           //   if(modetype[i].mode_id == 1){
-           //     modetype[i].mode_id = "HD"
-           //   }
-           //   if(modetype[i].mode_id == 2){
-           //     modetype[i].mode_id = "HDF"
-           //   }
-           //   if(modetype[i].mode_id == 3){
-           //     modetype[i].mode_id = "HD+HP"
-           //   }
-           //    if(modetype[i].mode_id == 4){
-           //     modetype[i].mode_id = "HP"
-           //   }
-           //    if(modetype[i].mode_id == 5){
-           //     modetype[i].mode_id = "HF"
-           //   }
-           //   if(modetype[i].mode_id == 6){
-           //     modetype[i].mode_id = "SCUF"
-           //   }
-           //   if(modetype[i].mode_id == 7){
-           //     modetype[i].mode_id = "IUF"
-           //   }
-           //    if(modetype[i].mode_id == 8){
-           //     modetype[i].mode_id = "HFHD"
-           //   }
-           //   if(modetype[i].mode_id == 9){
-           //     modetype[i].mode_id = "HFHD+HP"
-           //   }
-           //   if(modetype[i].mode_id == 10){
-           //     modetype[i].mode_id = "PHF"
-           //   }
-           //   if(modetype[i].mode_id == 11){
-           //     modetype[i].mode_id = "HFR"
-           //   }
-           //  if(modetype[i].mode_id == 12){
-           //     modetype[i].mode_id = "HDF+HP"
-           //   }
-           //    if(modetype[i].mode_id == 13){
-           //     modetype[i].mode_id = "HFHD+HP"
-           //   }
-           //    if(modetype[i].mode_id == 14){
-           //     modetype[i].mode_id = "腹水回输"
-           //   }
-           //  if(modetype[i].mode_id == 19){
-           //     modetype[i].mode_id = "IUF+HD"
-           //   }
-           //}
            this.modetype = modetype
            console.log("modetype",modetype)
 
@@ -511,11 +502,13 @@ export default {
       getTotalLapseCount(startDate,endDate).then(response=>{
          if(response.data.state == 1){
           var patients =  response.data.data.patients
-          var total = response.data.data.total
-          this.rollOut = total
+          this.rollOutTotal = patients.length
+          console.log("留治病人长度",patients.length)
+          var patienttwo = response.data.data.patienttwo
+          this.outTotal = patienttwo.length
+            console.log("转出长度", this.outTotal)
           var count = response.data.data.count
           this.patientCount = count
-          this.RetentionCount = count-total
          }
       })
     },
@@ -539,32 +532,26 @@ export default {
        getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
            if(response.data.state === 1){
              this.InfectiousTotal = response.data.data.total
+             console.log("===",this.InfectiousTotal)
              var infectious = response.data.data.count
-             this.InfectiousList = infectious
-           // for(let i=0;i<infectious.length;i++){
-           //   if(infectious[i].disease_id == 1){
-           //      infectious[i].disease_id = "其他"
-            //   }
-            //   if(infectious[i].disease_id == 2){
-            //     infectious[i].disease_id = "乙肝"
-            //   }
-           //    if(infectious[i].disease_id == 3){
-            //     infectious[i].disease_id = "丙肝"
-           //    }
-            //   if(infectious[i].disease_id == 4){
-            //     infectious[i].disease_id = "艾滋病"
-            //   }
-            //   if(infectious[i].disease_id == 5){
-            //     infectious[i].disease_id = "肺结核"
-            //   }
-            //   if(infectious[i].disease_id == 6){
-            //     infectious[i].disease_id = "梅毒"
-            //   }
-
-            // }
+             console.log("infectious",infectious)
              var otherTotal = response.data.data.otherTotal
+             console.log("otherTotal",otherTotal)
              this.otherTotal = otherTotal
-             // console.log("infectious-----------",otherTotal)
+              var arr = [
+                {count:0,disease_id:2},
+                {count:0,disease_id:3},
+                {count:0,disease_id:4},
+                {count:0,disease_id:5},
+                {count:0,disease_id:6},
+              ]
+             if(infectious.length == 0){
+                this.InfectiousList = arr
+                return false
+                
+             }
+             this.InfectiousList = infectious
+            
            }
        })
     },
@@ -572,55 +559,51 @@ export default {
       getTotalAgeCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
-          this.ageCount = ageCount
-        //  console.log("ageCount",ageCount)
+          console.log("ageCount",ageCount)
+          var arr = []
+          arr =  ageCount.sort(this.compare('age'))
+          this.ageCount = arr
           this.ageTotal =  response.data.data.total
-         // var two = response.data.data.two
-        //  console.log("two",two)
 
          }
       })
     },
+     compare:function (k) {
+          return function (a, b) {
+              var M = a[k];
+              var N = b[k];
+              return M - N;      // 从低向高排
+              // return N - M;   // 从高向低排
+          }
+      },
     //统计透析年龄
     getTotalDialysisCount(timeStar,timeEnd){
+      //  const endDate = moment(new Date()).format('YYYY-MM-DD')
+      //  console.log("结束时间",endDate)
+      //  var end = Date.parse(endDate)/1000
+      //  console.log("end",end)
+      //  const startDate = moment().subtract('month', 144).format('YYYY-MM-DD')
+      //  var twStart = Date.parse(startDate)/1000
+      //  console.log("12年前",twStart)
+      // const start = moment().subtract('month', 432).format('YYYY-MM-DD')
+      // console.log("start",start)
+      //  var sixStart = Date.parse(start)/1000
+      //  console.log("36年前",sixStart)
+      //  const sevnstart = moment().subtract('month', 720).format('YYYY-MM-DD')
+      //  var sevenStart = Date.parse(sevnstart)/1000
+      //  console.log("60年前",sevenStart)
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
            console.log("dataage",dataage)
-           var nowtime =  response.data.data.nowtime
-           console.log("nowtime",nowtime)
-           var patients = response.data.data.patients
-           var arr =[]
-           var arrtwo = []
-           var arrthree = []
-           for(let i=0;i<patients.length;i++){
-             if(nowtime - patients[i].first_dialysis_date <= 378691200){
-                arr.push(patients[i].first_dialysis_date)
-             }
-             if((nowtime-patients[i].first_dialysis_date)>378691200 && (nowtime-patients[i].first_dialysis_date)<=1136073600){
-               arrtwo.push(patients[i].first_dialysis_date)
-             }
-             if((nowtime-patients[i].first_dialysis_date)>1136073600 && (nowtime-patients[i].first_dialysis_date)<=1893456000){
-               arrthree.push(patients[i].first_dialysis_date)
-             }
-           }
-           this.totalone = arr.length
-           this.totaltwo = arrtwo.length
-           this.totalthree = arrthree.length
-           console.log("长度",arr.length)
-           console.log("长度2",arrtwo.length)
-           console.log("长度3",arrthree.length)
-           console.log("patients",patients)
-
-            var date =  new Date(1212508800)
-          console.log("date",date)
+           this.dialysisAge = dataage
 
          }
       })
     }
   },
   created() {
-     //获取本月当前机构的透析模式
+        //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       console.log("开始时间",startDate)
       const endDate = moment(new Date()).format('YYYY-MM-DD')

src/xt_pages/qcd/checkStatistical.vue

@@ -114,7 +114,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "统计配置" },
         { path: false, name: "检验检查统计配置" }
       ],

src/xt_pages/qcd/components/LineChart.vue

@@ -176,7 +176,7 @@ export default {
             interval: 0,
             formatter: function(value) {
               var ret = ""; //拼接加\n返回的类目项
-              var maxLength = 8; //每项显示文字个数
+              var maxLength = 10; //每项显示文字个数
               var valLength = value.length; //X轴类目项的文字个数
               var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
               if (rowN > 1) {

src/xt_pages/qcd/dialysisTotal.vue

@@ -167,7 +167,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "透析总量" }
       ],
       total: 0,

src/xt_pages/qcd/indicatorControlAnalysis/analysis.vue

@@ -7,9 +7,8 @@
       <div class="page_analysis">
         <new-nav activeName="analysis"></new-nav>
         <div class="cell clearfix">
-          <label class="title">
-            <span class="name">转归状态</span> :
-          </label>
+          <!--<label class="title">-->
+          <!--</label>-->
           <div class="time">
             <ul class>
               <li
@@ -50,7 +49,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "指标评估统计" },
         { path: false, name: "化验指标统计" }
       ],

src/xt_pages/qcd/indicatorControlAnalysis/analysisDetails.vue

@@ -88,7 +88,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "指标评估统计" },
         { path: false, name: "化验指标统计详情" }
       ],

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -69,7 +69,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table :data="patientsData" ref="table" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -175,7 +175,7 @@
   import { getCurrentOrgPatients } from "@/api/common/common";
 
 
-  import {GetDialysisBloodPressureChartData,GetDialysisBloodPressureTableData} from "@/api/common/statistics"
+  import {GetDialysisBloodPressureChartData,GetDialysisBloodPressureTableData,GetDefalutPatient} from "@/api/common/statistics"
 
   import {
     PostSearch
@@ -192,6 +192,8 @@
     },
     data() {
       return {
+        percent:[],
+
         pickerOptions: {
           disabledDate(time) {
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
@@ -203,7 +205,7 @@
         ],
         loading: false,
         search_value: '',
-        total: '',
+        total: 0,
         query: {
           patient_id: '',
           statistics_type: 1,
@@ -251,7 +253,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -320,7 +332,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}次'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -364,6 +386,10 @@
       }
     },
     methods: {
+      jumpDetail(patient_id){
+        this.$router.push("/qcd/indicatorControlAnalysis/bloodPressureDetails?id="+patient_id)
+
+      },
       changeProject(val){
         this.query.statistics_type = val
         this.query.page = 1
@@ -374,14 +400,17 @@
         this.query.patient_id = val.id
         this.query.page = 1
         this.GetDialysisBloodPressureTableData(this.query)
-        this.GetDialysisBloodPressureChartData(this.query)
+        // this.GetDialysisBloodPressureChartData(this.query)
       },
       handleSizeChange(limit) {
         this.query.limit = limit;
+        this.GetDialysisBloodPressureTableData(this.query)
+
 
       },
       handleCurrentChange(page) {
         this.query.page = page;
+        this.GetDialysisBloodPressureTableData(this.query)
 
       },
       changeTime(val) {
@@ -442,12 +471,6 @@
       },
       getModeName(mode_id){
         return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name: ""
-      },
-      changeTime() {
-
-      }, changeEndTime() {
-
-
       }, GetDialysisBloodPressureTableData(params) {
         this.loading = true
         this.tableData = []
@@ -460,6 +483,7 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.total
             } else {
               this.loading = false
             }
@@ -471,6 +495,8 @@
       GetDialysisBloodPressureChartData(params) {
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
+        this.percent = []
+
         GetDialysisBloodPressureChartData(params)
           .then(rs => {
             var resp = rs.data
@@ -478,7 +504,9 @@
                 for (let i = 0; i < resp.data.data.length; i++) {
                   this.bar.xAxis.data.push(resp.data.data[i].name)
                   this.bar.series[0].data.push(resp.data.data[i].total)
-              }
+                  this.percent.push(resp.data.data[i].ratio)
+
+                }
             } else {
             }
           })
@@ -490,6 +518,11 @@
         this.query.page = 1
         this.GetDialysisBloodPressureChartData(this.query)
         this.GetDialysisBloodPressureTableData(this.query)
+        for (let i = 0;i < this.patientsData.length; i++){
+          if (this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
 
       },
       querySearchAsync(keyword, cb) {
@@ -514,14 +547,26 @@
           if(response.data.state == 1){
             var patients = response.data.data.patients
             this.patientsData = patients
+            // this.GetDefaultPatient()
           }
         })
-      },
+      },GetDefaultPatient() {
+        GetDefalutPatient().then(response => {
+          if (response.data.state == 1) {
+            var patient = response.data.data.patient
+            for (let i = 0;i < this.patientsData.length; i++){
+              if (this.patientsData[i].id == patient.id){
+                this.$refs.table.setCurrentRow(this.patientsData[i])
+              }
+            }
+          }
+        })
+      }
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-      var day = date.getDate() < 0 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
       var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
       this.query.patient_id = 0
       this.query.end_time = year + '-' + month + '-' + day

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -8,47 +8,64 @@
         <div class="cell clearfix" style="margin:0">
           <el-form :inline="true" :model="listQuery">
             <el-form-item label>
-              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+              <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model="search_value"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入病人名字"
+                @select="handleSelect"
+              >
+                <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+              </el-autocomplete>
             </el-form-item>
           </el-form>
         </div>
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-              <el-table-column prop="date" label="日期" width="70"></el-table-column>
-              <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      highlight-current-row
+                      @current-change="handleChange">
+              <el-table-column prop="dialysis_no" label="透析号" width="80">
+                <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+              </el-table-column>
+              <el-table-column prop="name" label="姓名" width="80">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+              </el-table-column>
             </el-table>
+
           </div>
           <div class="containerRight" style="flex:1;overflow: hidden">
             <div class="cell clearfix">
               <label class="title" style="text-align:left">
                 <span class="name">血压阶段</span> :
               </label>
-              <el-select
-                v-model="value"
-                placeholder="请选择"
-                @change="chooseType"
-                style="width:110px;margin-right:10px"
-              >
+              <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px" @change="changeProject">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
+
                 ></el-option>
               </el-select>
               <label class="title">
                 <span class="name">日期查询</span> :
               </label>
               <el-date-picker
-                v-model="listQuery.start_time"
+                v-model="query.start_time"
                 prefix-icon="el-icon-date"
                 @change="changeTime"
                 :editable="false"
+                style="width: 150px;"
                 type="date"
-                style="max-width:160px"
+                :picker-options="pickerOptions"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -56,12 +73,13 @@
               ></el-date-picker>
               <span class>-</span>
               <el-date-picker
-                v-model="listQuery.end_time"
+                v-model="query.end_time"
                 prefix-icon="el-icon-date"
                 @change="changeEndTime"
                 :editable="false"
+                :picker-options="pickerOptions"
+                style="width: 150px;"
                 type="date"
-                style="max-width:160px"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -74,18 +92,48 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-                <el-table-column fixed prop="date" label="日期"></el-table-column>
-                <el-table-column prop="name" label="姓名"></el-table-column>
-                <el-table-column prop="province" label="省份"></el-table-column>
-                <el-table-column prop="city" label="市区"></el-table-column>
+              <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+                <el-table-column fixed label="日期" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.schedule_date | parseTime("{y}-{m}-{d}") }}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透前血压" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透析中最低血压" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透析中最高血压" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>
+
+
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透后血压" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.after.systolic_blood_pressure"> {{ scope.row.after.systolic_blood_pressure}} /{{scope.row.after.diastolic_blood_pressure}}</div>
+                  </template>
+                </el-table-column>
+
+
               </el-table>
 
+
               <el-pagination
                 align="right"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :current-page="listQuery.page"
+                :current-page="query.page"
                 :page-sizes="[10, 20, 50, 100]"
                 :page-size="10"
                 background
@@ -105,6 +153,11 @@
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../../qcd/components/LineChart";
+import { getCurrentOrgPatients } from "@/api/common/common";
+import {GetDialysisPatientBloodPressureChartData,GetDialysisBloodPressureTableData} from "@/api/common/statistics"
+import { PostSearch } from '@/api/patient'
+import { uParseTime } from "@/utils/tools";
+
 export default {
   components: {
     LineChart,
@@ -112,77 +165,47 @@ export default {
   },
   data() {
     return {
-      crumbs: [
-        { path: false, name: "科室质控" },
-        { path: false, name: "患者血压详情" }
-      ],
-      tableData: [
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
+      },
+      patientsData:[],
+      tableData: [
       ],
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
+      loading: false,
+      search_value: '',
+      total: 0,
+      query: {
+        patient_id: '',
+        statistics_type: 1,
+        start_time: '',
+        end_time: '',
+        limit: 10,
+        page: 1
       },
+      options: [
+        { value: 1, name: '透前血压' },
+        { value: 2, name: '透后血压' },
+      ],
+
+      crumbs: [
+        { path: false, name: "质控管理" },
+        { path: false, name: "患者血压详情" }
+      ],
+
       chart: {
         title: {
           text: "ECharts 入门示例"
         },
         tooltip: {},
         legend: {
-          data: ["收缩压", "舒张压"],
+          data: [],
           left: 0
         },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -195,22 +218,14 @@ export default {
             name: "收缩压",
             type: "line",
             data: [
-              "78.57",
-              "50",
-              "80",
-              "93.33",
-              "92.86",
-              "100",
-              "12",
-              "77",
-              "37"
+
             ],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}"
               }
             },
             //配置样式
@@ -226,13 +241,13 @@ export default {
           {
             name: "舒张压",
             type: "line",
-            data: ["10", "20", "30", "53.33", "42.86", "100", "60", "27", "97"],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}"
               }
             },
             //配置样式
@@ -247,97 +262,162 @@ export default {
           }
         ]
       },
-      tableData1: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ]
     };
   },
   methods: {
+    GetDialysisBloodPressureTableData(params) {
+      this.loading = true
+      this.tableData = []
+      GetDialysisBloodPressureTableData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.loading = false
+
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.tableData.push(resp.data.data[i])
+            }
+            this.total = resp.data.total
+          } else {
+            this.loading = false
+          }
+        })
+        .catch(error => {
+
+        })
+    },
+    changeProject(val){
+      this.query.statistics_type = val
+      this.query.page = 1
+      this.GetDialysisPatientBloodPressureChartData(this.query)
+
+    },
+    handleChange(val){
+      this.query.patient_id = val.id
+      this.query.page = 1
+      this.GetDialysisBloodPressureTableData(this.query)
+      this.GetDialysisPatientBloodPressureChartData(this.query)
+    },
+    handleSizeChange(limit) {
+      this.query.limit = limit;
+      this.GetDialysisBloodPressureTableData(this.query)
+
+
+    },
+    handleCurrentChange(page) {
+      this.query.page = page;
+      this.GetDialysisBloodPressureTableData(this.query)
+
+
+    },changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.start_time = "";
+      } else {
+        // this.getDialysisList()
+        this.query.page = 1;
+        this.GetDialysisBloodPressureChartData(this.query)
+        this.GetDialysisBloodPressureTableData(this.query)
+
+      }
+
+    },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.end_time = "";
+      } else {
+        this.query.page = 1;
+        this.GetDialysisBloodPressureChartData(this.query)
+        this.GetDialysisBloodPressureTableData(this.query)
+
+      }
+    },  getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },GetDialysisPatientBloodPressureChartData(params) {
+
+      this.chart.xAxis.data = []
+      this.chart.series[0].data = []
+      this.chart.series[1].data = []
+      GetDialysisPatientBloodPressureChartData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.chart.xAxis.data.push(resp.data.data[i].date)
+              this.chart.series[0].data.push(resp.data.data[i].systolic_blood_pressure)
+              this.chart.series[1].data.push(resp.data.data[i].diastolic_blood_pressure)
+            }
+          } else {
+          }
+        })
+        .catch(error => {
+        })
+    }, handleSelect(val) {
+      this.query.patient_id = val.id
+      this.query.page = 1
+      this.GetDialysisPatientBloodPressureChartData(this.query)
+      this.GetDialysisBloodPressureTableData(this.query)
+
+      for (let i = 0;i < this.patientsData.length; i++){
+        if (this.patientsData[i].id == val.id){
+          this.$refs.table.setCurrentRow(this.patientsData[i])
+        }
+      }
+
+    },  querySearchAsync(keyword, cb) {
+      let key = ''
+      if (keyword != undefined) {
+        key = keyword
+      }
+      let searchArray = []
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.patient
+          cb(searchArray)
+        } else {
+          cb([])
+        }
+      })
+    },getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+        if(response.data.state == 1){
+          var patients = response.data.data.patients
+          this.patientsData = patients
+
+          for (let i = 0;i < this.patientsData.length; i++){
+            if (this.patientsData[i].id == this.query.patient_id){
+              this.$refs.table.setCurrentRow(this.patientsData[i])
+            }
+          }
+        }
+      })
+    },
+
     chooseMonth(month) {
       this.monthType = month;
     },
     clickQuality(index) {
       this.quality = index;
     }
+  },created() {
+    var date = new Date()
+    var year = date.getFullYear() //获取完整的年份(4位)
+    var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+    var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+    var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+    this.query.patient_id = this.$route.query.id
+    this.query.end_time = year + '-' + month + '-' + day
+    this.query.start_time = year + '-' + last_month + '-' + day
+    this.query.statistics_type = 1
+    this.GetDialysisPatientBloodPressureChartData(this.query)
+    this.GetDialysisBloodPressureTableData(this.query)
+    this.getCurrentOrgPatients()
+
   }
 };
 </script>

src/xt_pages/qcd/indicatorControlAnalysis/components/NewNav.vue

@@ -2,7 +2,7 @@
   <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
     <el-tab-pane label="化验指标统计" name="analysis"></el-tab-pane>
     <el-tab-pane label="透析过程指标统计" name="process"></el-tab-pane>
-    <el-tab-pane label="透析监测信息统计" name="monitor"></el-tab-pane>
+    <el-tab-pane label="透析监测指标统计" name="monitor"></el-tab-pane>
     <el-tab-pane label="患者血压统计" name="bloodPressure"></el-tab-pane>
     <el-tab-pane label="患者体重统计" name="weight"></el-tab-pane>
   </el-tabs>

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -1,58 +1,51 @@
 <template>
   <div class="page_office">
     <div class="cell clearfix">
-      <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
+      <el-select v-model="query.project_id" placeholder="请选择" style="width:120px;margin-right:20px"
+                 @change="changeProject">
         <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          v-for="item in project_columns"
+          :key="item.project_id"
+          :label="item.project_name"
+          :value="item.project_id"
         ></el-option>
       </el-select>
+
       <el-select
-        v-model="value"
+        v-model="query.item_id"
         placeholder="请选择"
-        @change="chooseType"
         style="width:120px;margin-right:20px"
+        @change="changeItem"
       >
         <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          v-for="item in item_columns"
+          :key="item.id"
+          :label="item.item_name"
+          :value="item.id"
         ></el-option>
       </el-select>
-      <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
-      <el-select
-        v-model="value"
-        placeholder="请选择"
-        @change="chooseType"
-        style="width:120px;margin-right:20px"
-      >
+
+      <el-select v-model="query.range_value" placeholder="请选择" style="width:120px;margin-right:20px"
+                 @change="changeRangeValue">
         <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          v-for="item in range_value_columns"
+          :key="item"
+          :label="item"
+          :value="item"
         ></el-option>
       </el-select>
+
       <label class="title">
         <span class="name">日期查询</span> :
       </label>
       <el-date-picker
-        v-model="listQuery.start_time"
+        v-model="query.start_time"
         prefix-icon="el-icon-date"
         @change="changeTime"
         :editable="false"
-        style="width: 196px;"
+        style="width: 150px;"
         type="date"
+        :picker-options="pickerOptions"
         placeholder="选择日期时间"
         align="right"
         format="yyyy-MM-dd"
@@ -60,11 +53,12 @@
       ></el-date-picker>
       <span class>-</span>
       <el-date-picker
-        v-model="listQuery.end_time"
+        v-model="query.end_time"
         prefix-icon="el-icon-date"
         @change="changeEndTime"
         :editable="false"
-        style="width: 196px;"
+        :picker-options="pickerOptions"
+        style="width: 150px;"
         type="date"
         placeholder="选择日期时间"
         align="right"
@@ -74,264 +68,461 @@
     </div>
     <div class="tableTitle">统计图</div>
     <div>
-      <line-chart :options="chart"></line-chart>
+      <line-chart :options="options"></line-chart>
     </div>
     <div class="tableTitle">统计表</div>
     <div>
-      <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-        <el-table-column fixed prop="date" label="日期"></el-table-column>
-        <el-table-column prop="name" label="姓名"></el-table-column>
-        <el-table-column prop="province" label="省份"></el-table-column>
-        <el-table-column prop="city" label="市区"></el-table-column>
-        <el-table-column prop="address" label="地址"></el-table-column>
-        <el-table-column prop="zip" label="邮编"></el-table-column>
-        <el-table-column label="操作">
+      <el-table :data="tableData" style="width: 100%" :height="tableHeight">
+
+
+        <el-table-column fixed label="姓名" align="center">
+          <template slot-scope="scope">
+            {{scope.row.patient.name}}
+          </template>
+        </el-table-column>
+
+        <el-table-column  label="检查日期" align="center">
           <template slot-scope="scope">
-            <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+            <!--{{getTime(scope.row.inspect_date)}}-->
+            {{scope.row.inspect_date | parseTime('{y}-{m}-{d}') }}
+
           </template>
         </el-table-column>
+
+
+        <el-table-column :label="item_name" align="center">
+          <template slot-scope="scope">
+            {{getValue(scope.row)}}
+
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="趋势" align="center">
+          <template slot-scope="scope">
+            <el-button
+              @click.native.prevent="jumpDetail(scope.row)"
+              type="text"
+              size="small"
+            >详情
+            </el-button>
+          </template>
+        </el-table-column>
+
       </el-table>
 
-      <el-pagination
-        align="right"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="listQuery.page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
+      <!--<el-pagination-->
+        <!--align="right"-->
+        <!--@size-change="handleSizeChange"-->
+        <!--@current-change="handleCurrentChange"-->
+        <!--:current-page="query.page"-->
+        <!--:page-sizes="[10, 20, 50, 100]"-->
+        <!--:page-size="10"-->
+        <!--background-->
+        <!--style="margin-top:20px;"-->
+        <!--layout="total, sizes, prev, pager, next, jumper"-->
+        <!--:total="total"-->
+      <!--&gt;</el-pagination>-->
     </div>
   </div>
 </template>
 
 
 <script>
-import echarts from "echarts";
-import LineChart from "../../components/LineChart";
-export default {
-  components: {
-    LineChart
-  },
-  data() {
-    return {
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
-      ],
-      value: "请选项",
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ],
-      chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
+  import echarts from 'echarts'
+  import LineChart from '../../components/LineChart'
+  import {
+    GetInspectionIndexChart,
+    GetInspectionIndexInit,
+    GetInspectionIndexTable,
+    GetPatientInspectionIndexBarChart,
+    GetPatientInspectionIndexChart,
+    GetRangeValue
+  } from '@/api/common/statistics'
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    components: {
+      LineChart
+    },
+    data() {
+      return {
+        percent:[],
+
+        pickerOptions: {
+          disabledDate(time) {
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            return time.getTime() > Date.now() || time.getTime() < threeMonths
+
+          }
         },
-        xAxis: {
-          data: ["达标", "未达标"]
+        total:0,
+        item_name: '',
+        query: {
+          patient_id: '',
+          start_time: '',
+          end_time: '',
+          limit: 20,
+          page: 1,
+          project_id: '',
+          item_id: '',
+          range_type: '',
+          range_value: ''
         },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+        project_columns: [],
+        item_columns: [],
+        range_value_columns: [],
+
+        all_inspection_reference: [],
+
+        value: '请选项',
+        tableData: [],
+        options: {
+          title: {
+            text: 'ECharts 入门示例'
           },
-          show: false
-        },
-        series: [
-          {
-            name: "次数",
-            type: "bar",
-            data: ["78.57", "50"],
-            barWidth: 30,
-            label: {
-              normal: {
-                show: true,
-                position: "top",
-                formatter: "{c}次"
-              }
+          tooltip: {},
+          legend: {
+            data: [''],
+            left: 0
+          },
+          xAxis: {
+            data: ['达标', '未达标']
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
             },
-            //配置样式
-            itemStyle: {
-              //通常情况下：
-
-              //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
-              normal: {
-                color: function(params) {
-                  //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
-                  var colorList = [
-                    ["#A9E0F3", "#9FBDFC"],
-
-                    ["#FFD7C0", "#FF9994"]
-                  ];
-
-                  var index = params.dataIndex;
-                  if (params.dataIndex >= colorList.length) {
-                    index = params.dataIndex % colorList.length;
+            show: false
+          },
+
+          series: [
+            {
+              name: '',
+              type: 'bar',
+              data: ['78.57', '50'],
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: 'top',
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
                   }
+                }
+              },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
+
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: function(params) {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = ['#A9E0F3', '#9FBDFC']
 
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    { offset: 0, color: colorList[index][0] },
-                    // { offset: 0.5, color: colorList[index][1] },
-                    { offset: 1, color: colorList[index][1] }
-                  ]);
+                    // var index = params.dataIndex;
+                    // if (params.dataIndex >= colorList.length) {
+                    //   index = params.dataIndex % colorList.length;
+                    // }
+
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      { offset: 0, color: colorList[0] },
+                      // { offset: 0.5, color: colorList[index][1] },
+                      { offset: 1, color: colorList[1] }
+                    ])
+                  },
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
                 },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
-              },
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
               }
             }
-          }
-        ]
+          ]
+        }
       }
-    };
-  },
-  methods: {
-    changeTime() {},
-    changeEndTime(val) {
-      var time =
-        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
-      if (time < 0) {
-        this.$message.error("结束时间不能小于开始时间");
-        this.listQuery.end_time = "";
-      } else {
+    },
+    methods: {
+      getValue(row) {
+        if (this.query.range_type == 1 ) {
+          if(row.inspect_value != "") {
+            let min_range_value = this.range_value_columns[2]
+            let arr = min_range_value.split("~")
+            if (parseFloat(row.inspect_value) > arr[1]) {
+              return row.inspect_value + "↑"
+            } else if (parseFloat(row.inspect_value) < arr[0]) {
+              return row.inspect_value + "↓"
+            } else {
+              return row.inspect_value
+            }
+          }else{
+            return row.inspect_value
+          }
+
+        } else if (this.query.range_type == 2) {
+          return row.inspect_value
+        }
+      },
+      getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000;
+      },
+      jumpDetail(row){
+        // this.$router.push("/qcd/indicatorControlAnalysis/bloodPressureDetails?id="+patient_id)
+        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+row.inspect_type+"&patient_id="+row.patient.id)
+      },
+      handleSizeChange(limit) {
+        this.query.limit = limit
+        this.GetInspectionIndexTable(this.query)
+
+      },
+      handleCurrentChange(page) {
+        this.query.page = page
+        this.GetInspectionIndexTable(this.query)
+
+      },
+      changeProject(val) {
+        this.query.page = 1
+        let item_inspection_reference = []
+        for (let i = 0; i < this.all_inspection_reference.length; i++) {
+          if (this.all_inspection_reference[i].project_id == val) {
+            item_inspection_reference.push(this.all_inspection_reference[i])
+          }
+        }
+        this.item_columns = item_inspection_reference
+        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
+        console.log("projectInfo",projectInfo)
+        this.query.project_id = projectInfo.project_id
+        this.query.item_id = projectInfo.id
+        this.item_name = projectInfo.item_name
+        this.query.range_type = projectInfo.range_type
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+
+      }, changeItem(val) {
+        this.query.page = 1
+        this.query.item_id = val
+        var projectInfo = this.getPojectInfo(this.query.project_id, val)
+        console.log(projectInfo)
+        this.item_name = projectInfo.item_name
+
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+
+      }, changeRangeValue(val) {
+        this.query.range_value = val
+        this.query.page = 1
+        this.GetInspectionIndexTable(this.query)
+
+      },
+      GetInspectionIndexInit() {
+        GetInspectionIndexInit()
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              let project = []
+              let item = []
+              this.all_inspection_reference = resp.data.references
+               console.log("====",this.all_inspection_reference)
+              for (let i = 0; i < this.all_inspection_reference.length; i++) {
+                project.push(this.all_inspection_reference[i])
+              }
+              var obj = {}
+              //去重复
+              project = project.reduce((cur, next) => {
+                obj[next.project_id] ? '' : (obj[next.project_id] = true && cur.push(next))
+                return cur
+              }, [])
+
+              this.project_columns = project
+
+              for (let i = 0; i < this.all_inspection_reference.length; i++) {
+                if (this.all_inspection_reference[i].project_id == this.project_columns[0].project_id) {
+                  item.push(this.all_inspection_reference[i])
+                }
+              }
+             console.log("item",item)
+              this.item_columns = item
+              this.item_name = item[0].item_name
+
+              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].id)
+              this.query.project_id = projectInfo.project_id
+              this.query.item_id = projectInfo.id
+              this.query.range_type = projectInfo.range_type
+              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+            } else {
+              this.$message.error(resp.msg)
+
+            }
+          })
+          .catch(error => {
+
+          })
+
+      },
+      getPojectInfo(project_id, item_id) {
+        for (let i = 0; i < this.all_inspection_reference.length; i++) {
+          if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].id == item_id) {
+            return this.all_inspection_reference[i]
+          }
+        }
+        return null
+      },
+      changeTime(val) {
+        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time)
+        if (time > 0) {
+          this.$message.error('结束时间不能小于开始时间')
+        } else {
+          // this.getDialysisList()
+          this.query.page = 1
+          this.GetInspectionIndexChart(this.query)
+          this.GetInspectionIndexTable(this.query)
+
+        }
+
+      },
+      changeEndTime(val) {
+        var time =
+          this.getTimestamp(val) - this.getTimestamp(this.query.start_time)
+        if (time < 0) {
+          this.$message.error('结束时间不能小于开始时间')
+        } else {
+          this.query.page = 1
+          this.GetInspectionIndexChart(this.query)
+          this.GetInspectionIndexTable(this.query)
+
+        }
+      },
+      handleClick(row) {
+        console.log(row)
+        this.$router.push({ path: '/qcd/analysisDetails' })
+      },
+      GetRangeValue(range_type, project_id, id) {
+        let params = {
+          range_type: range_type,
+          project_id: project_id,
+          item_id: id
+        }
+        GetRangeValue(params)
+          .then(rs => {
+              var resp = rs.data
+              if (resp.state == 1) {
+                if (range_type == 1) {
+                  this.range_value_columns = []
+                  this.range_value_columns.push('全部')
+                  this.range_value_columns.push('小于' + resp.data.range_vaule[0])
+                  this.range_value_columns.push(resp.data.range_vaule[0] + '~' + resp.data.range_vaule[1])
+                  this.range_value_columns.push('大于' + resp.data.range_vaule[1])
+                  this.query.range_value = '全部'
+
+                } else {
+                  this.range_value_columns = []
+                  this.range_value_columns.push('全部')
+                  for (let i = 0; i < resp.data.range_vaule.length; i++) {
+                    this.range_value_columns.push(resp.data.range_vaule[i])
+                  }
+                  this.query.range_value = '全部'
+                }
+                this.GetInspectionIndexChart(this.query)
+                this.GetInspectionIndexTable(this.query)
+              } else {
+                this.$message.error(resp.msg)
+
+              }
+            }
+          )
+          .catch(error => {
+
+          })
+      },
+      GetInspectionIndexChart(params) {
+        this.options.xAxis.data = []
+        this.options.series[0].data = []
+        this.percent = []
+        GetInspectionIndexChart(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              for (let i = 0; i < resp.data.data.length; i++) {
+                this.options.xAxis.data.push(resp.data.data[i].name)
+                this.options.series[0].data.push(resp.data.data[i].total)
+                this.percent.push(resp.data.data[i].ratio)
+              }
+            } else {
+              this.$message.error(resp.msg)
+            }
+          })
+          .catch(error => {
+
+          })
+      },
+      GetInspectionIndexTable(params) {
+        GetInspectionIndexTable(params)
+          .then(rs => {
+            var resp = rs.data
+            console.log("resp",resp)
+            if (resp.state == 1) {
+              this.tableData = []
+              for (let i = 0; i < resp.data.data.length; i++) {
+                this.tableData.push(resp.data.data[i])
+              }
+              this.total = resp.data.total
+
+            } else {
+              this.$toast({
+                message: resp.msg
+              })
+            }
+          })
+          .catch(error => {
+
+          })
+
       }
     },
-    handleClick(row) {
-      console.log(row);
-      this.$router.push({ path: "/qcd/analysisDetails" });
+    created() {
+      this.tableHeight = (document.documentElement.clientHeight - 44) + 'px'
+      var date = new Date()
+      var year = date.getFullYear() //获取完整的年份(4位)
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+      var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+      this.query.end_time = year + '-' + month + '-' + day
+      this.query.start_time = year + '-' + last_month + '-' + day
+      this.GetInspectionIndexInit()
+      // this.GetDialysisBloodPressureTableData(this.query)
+
     }
+
   }
-};
+
 </script>
 
 
 <style lang="scss" scoped>
-.tableTitle {
-  font-size: 16px;
-  color: #000;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
+  .tableTitle {
+    font-size: 16px;
+    color: #000;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
 </style>
 <style lang="scss">
-.page_office {
+  .page_office {
+
   .cell {
     text-align: center;
   }
-}
+
+  }
 </style>

src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue

@@ -1,64 +1,70 @@
 <template>
   <div class="page_personal">
     <div class="cell clearfix">
-      <el-form :inline="true" :model="listQuery">
+      <el-form :inline="true">
         <el-form-item label>
-          <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:110px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+          <el-autocomplete
+            class="checkSearch"
+            popper-class="my-autocomplete"
+            v-model="search_value"
+            :fetch-suggestions="querySearchAsync"
+            :trigger-on-focus="false"
+            placeholder="请输入病人名字"
+            @select="handleSelect"
+          >
+            <i class="el-icon-search el-input__icon" slot="suffix"></i>
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.name }}</div>
+            </template>
+          </el-autocomplete>
+
         </el-form-item>
       </el-form>
-      <el-select v-model="value" placeholder="请选择" style="width:110px;margin-right:10px">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
-      <el-select
-        v-model="value"
-        placeholder="请选择"
-        @change="chooseType"
-        style="width:110px;margin-right:10px"
-      >
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
-      <el-select v-model="value" placeholder="请选择" style="width:110px;margin-right:10px">
+      <el-select v-model="query.project_id" placeholder="请选择" style="width:120px;margin-right:20px"
+                 @change="changeProject">
         <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          v-for="item in project_columns"
+          :key="item.project_id"
+          :label="item.project_name"
+          :value="item.project_id"
         ></el-option>
       </el-select>
+
       <el-select
-        v-model="value"
+        v-model="query.item_id"
         placeholder="请选择"
-        @change="chooseType"
-        style="width:110px;margin-right:10px"
+        style="width:120px;margin-right:20px"
+        @change="changeItem"
       >
         <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          v-for="item in item_columns"
+          :key="item.id"
+          :label="item.item_name"
+          :value="item.id"
         ></el-option>
       </el-select>
+
+      <!--<el-select v-model="query.range_value" placeholder="请选择" style="width:120px;margin-right:20px"-->
+                 <!--@change="changeRangeValue">-->
+        <!--<el-option-->
+          <!--v-for="item in range_value_columns"-->
+          <!--:key="item"-->
+          <!--:label="item"-->
+          <!--:value="item"-->
+        <!--&gt;</el-option>-->
+      <!--</el-select>-->
+
       <label class="title">
         <span class="name">日期查询</span> :
       </label>
       <el-date-picker
-        v-model="listQuery.start_time"
+        v-model="query.start_time"
         prefix-icon="el-icon-date"
         @change="changeTime"
         :editable="false"
         style="width: 150px;"
         type="date"
+        :picker-options="pickerOptions"
         placeholder="选择日期时间"
         align="right"
         format="yyyy-MM-dd"
@@ -66,10 +72,11 @@
       ></el-date-picker>
       <span class>-</span>
       <el-date-picker
-        v-model="listQuery.end_time"
+        v-model="query.end_time"
         prefix-icon="el-icon-date"
         @change="changeEndTime"
         :editable="false"
+        :picker-options="pickerOptions"
         style="width: 150px;"
         type="date"
         placeholder="选择日期时间"
@@ -81,20 +88,27 @@
     <el-container>
       <div style="width:150px">
         <div class="tableTitle">患者列表</div>
-        <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-          <el-table-column prop="date" label="日期" width="70"></el-table-column>
-          <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+        <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                  highlight-current-row
+                  @current-change="handleChange">
+          <el-table-column prop="dialysis_no" label="透析号" width="80">
+            <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+          </el-table-column>
+          <el-table-column prop="name" label="姓名" width="80">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
         </el-table>
       </div>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计图</div>
         <div>
-          <line-chart :options="chart"></line-chart>
+          <line-chart :options="options"></line-chart>
         </div>
         <div class="tableTitle">指标趋势</div>
         <div>
           <div>
-            <line-chart :options="chart1"></line-chart>
+            <line-chart :options="options2"></line-chart>
           </div>
         </div>
         <div></div>
@@ -105,267 +119,546 @@
 
 
 <script>
-import echarts from "echarts";
-import LineChart from "../../components/LineChart";
-export default {
-  components: {
-    LineChart
-  },
-  data() {
-    return {
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
-      ],
-      value: "请选项",
-      tableData: [
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        }
-      ],
-      chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
+  import echarts from 'echarts'
+  import LineChart from '../../components/LineChart'
+  import {
+    GetInspectionIndexChart,
+    GetInspectionIndexInit,
+    GetInspectionIndexTable,
+    GetPatientInspectionIndexBarChart,
+    GetPatientInspectionIndexChart,
+    GetRangeValue,
+    GetDefalutPatient
+  } from '@/api/common/statistics'
+  import { uParseTime } from '@/utils/tools'
+  import { getCurrentOrgPatients } from '@/api/common/common'
+
+  import { PostSearch } from '@/api/patient'
+
+  export default {
+    components: {
+      LineChart
+    },
+    data() {
+      return {
+        percent:[],
+
+        pickerOptions: {
+          disabledDate(time) {
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            return time.getTime() > Date.now() || time.getTime() < threeMonths
+
+          }
         },
-        xAxis: {
-          data: ["达标", "未达标"]
+        item_name: '',
+        search_value: '',
+        query: {
+          patient_id: '',
+          start_time: '',
+          end_time: '',
+          limit: 20,
+          page: 1,
+          project_id: '',
+          item_id: '',
+          range_type: '',
+          range_value: ''
         },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+        project_columns: [],
+        item_columns: [],
+        range_value_columns: [],
+
+        all_inspection_reference: [],
+        patientsData: [],
+        value: '请选项',
+        tableData: [],
+        options: {
+          title: {
+            text: 'ECharts 入门示例'
           },
-          show: false
-        },
-        series: [
-          {
-            name: "次数",
-            type: "bar",
-            data: ["78.57", "50"],
-            barWidth: 30,
-            label: {
-              normal: {
-                show: true,
-                position: "top",
-                formatter: "{c}次"
-              }
+          tooltip: {},
+          legend: {
+            data: [''],
+            left: 0
+          },
+          xAxis: {
+            data: []
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
             },
-            //配置样式
-            itemStyle: {
-              //通常情况下：
-
-              //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
-              normal: {
-                color: function(params) {
-                  //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
-                  var colorList = [
-                    ["#A9E0F3", "#9FBDFC"],
-
-                    ["#FFD7C0", "#FF9994"]
-                  ];
-
-                  var index = params.dataIndex;
-                  if (params.dataIndex >= colorList.length) {
-                    index = params.dataIndex % colorList.length;
+            show: false
+          },
+          series: [
+            {
+              name: '',
+              type: 'bar',
+              data: [],
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: 'top',
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
                   }
+                }
+              },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
+
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: function(params) {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = [
+                      ['#A9E0F3', '#9FBDFC'],
+
+                      ['#FFD7C0', '#FF9994']
+                    ]
 
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    { offset: 0, color: colorList[index][0] },
-                    // { offset: 0.5, color: colorList[index][1] },
-                    { offset: 1, color: colorList[index][1] }
-                  ]);
+                    var index = params.dataIndex
+                    if (params.dataIndex >= colorList.length) {
+                      index = params.dataIndex % colorList.length
+                    }
+
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      { offset: 0, color: colorList[index][0] },
+                      // { offset: 0.5, color: colorList[index][1] },
+                      { offset: 1, color: colorList[index][1] }
+                    ])
+                  },
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
                 },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
-              },
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
               }
             }
-          }
-        ]
-      },
-      chart1: {
-        title: {
-          text: "ECharts 入门示例"
-        },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
+          ]
         },
-        xAxis: {
-          data: ["达标", "未达标"]
-        },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+        options2: {
+          title: {
+            text: 'ECharts 入门示例'
           },
-          show: false
-        },
-        series: [
-          {
-            name: "次数",
-            type: "line",
-            data: ["78.57", "50"],
-            barWidth: 30,
-            label: {
-              normal: {
-                show: true,
-                position: "top",
-                formatter: "{c}次"
+          tooltip: {},
+          legend: {
+            data: ['次数'],
+            left: 0
+          },
+          xAxis: {
+            data: [],
+            axisLine: {
+              lineStyle: {
+                color: '#FF0000',
+                width: 8 //这里是为了突出显示加上的
               }
             },
-            //配置样式
-            itemStyle: {
-              //通常情况下：
-
-              //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
-              normal: {
-                color: function(params) {
-                  //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
-                  var colorList = [
-                    ["#A9E0F3", "#9FBDFC"],
-
-                    ["#FFD7C0", "#FF9994"]
-                  ];
-
-                  var index = params.dataIndex;
-                  if (params.dataIndex >= colorList.length) {
-                    index = params.dataIndex % colorList.length;
+            axisLabel: {
+              interval: 0,
+              formatter: function(value) {
+                var ret = '' //拼接加\n返回的类目项
+                var maxLength = 8 //每项显示文字个数
+                var valLength = value.length //X轴类目项的文字个数
+                var rowN = Math.ceil(valLength / maxLength) //类目项需要换行的行数
+                if (rowN > 1) {
+                  //如果类目项的文字大于3,
+                  for (var i = 0; i < rowN; i++) {
+                    var temp = '' //每次截取的字符串
+                    var start = i * maxLength //开始截取的位置
+                    var end = start + maxLength //结束截取的位置
+                    //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
+                    temp = value.substring(start, end) + '\n'
+                    ret += temp //凭借最终的字符串
                   }
+                  return ret
+                } else {
+                  return value
+                }
+              }
+            }
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
+            },
+            show: false,
+            axisLine: {
+              lineStyle: {
+                color: '#00FF00',
+                width: 8 //这里是为了突出显示加上的
+              }
+            }
+          },
+          series: [
+            {
+              name: '',
+              type: 'line',
+              data: [],
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: 'top',
+                  formatter: '{c}'
+                }
+              },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
 
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    { offset: 0, color: colorList[index][0] },
-                    // { offset: 0.5, color: colorList[index][1] },
-                    { offset: 1, color: colorList[index][1] }
-                  ]);
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: function(params) {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = [
+                      ['#A9E0F3', '#9FBDFC'],
+
+                      ['#FFD7C0', '#FF9994']
+                    ]
+
+                    var index = params.dataIndex
+                    if (params.dataIndex >= colorList.length) {
+                      index = params.dataIndex % colorList.length
+                    }
+
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      { offset: 0, color: colorList[index][0] },
+                      // { offset: 0.5, color: colorList[index][1] },
+                      { offset: 1, color: colorList[index][1] }
+                    ])
+                  },
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
                 },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
-              },
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
               }
             }
-          }
-        ]
-      }
-    };
-  },
-  methods: {
-    changeTime() {},
-    changeEndTime(val) {
-      var time =
-        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
-      if (time < 0) {
-        this.$message.error("结束时间不能小于开始时间");
-        this.listQuery.end_time = "";
-      } else {
+          ]
+        }
+
       }
+    },
+    methods: {
+      handleChange(val){
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetPatientInspectionIndexBarChart(this.query)
+        this.GetPatientInspectionIndexChart(this.query)
+      },
+      handleSelect(val) {
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetPatientInspectionIndexBarChart(this.query)
+        this.GetPatientInspectionIndexChart(this.query)
+
+        for (let i = 0; i< this.patientsData.length; i++){
+          if(this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
+
+      },
+      querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+
+      getCurrentOrgPatients() {
+        getCurrentOrgPatients().then(response => {
+          if (response.data.state == 1) {
+            var patients = response.data.data.patients
+            this.patientsData = patients
+
+            GetDefalutPatient()
+              .then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                  this.query.patient_id =resp.data.patient.id
+                  this.patient_name  = resp.data.patient.name
+
+                  for (let i = 0; i< this.patientsData.length; i++){
+                    if(this.patientsData[i].id == resp.data.patient.id){
+                      this.$refs.table.setCurrentRow(this.patientsData[i])
+                    }
+                  }
+
+
+                  this.GetInspectionIndexInit()
+                } else {
+
+                }
+              })
+              .catch(error => {
+
+              })
+
+          }
+        })
+      },
+      changeProject(val) {
+        this.query.page = 1
+        let item_inspection_reference = []
+        for (let i = 0; i < this.all_inspection_reference.length; i++) {
+          if (this.all_inspection_reference[i].project_id == val) {
+            item_inspection_reference.push(this.all_inspection_reference[i])
+          }
+        }
+        this.item_columns = item_inspection_reference
+        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
+        this.query.project_id = projectInfo.project_id
+        this.query.item_id = projectInfo.id
+        this.item_name = projectInfo.item_name
+        this.query.range_type = projectInfo.range_type
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+
+      }, changeItem(val) {
+        this.query.page = 1
+        this.query.item_id = val
+        var projectInfo = this.getPojectInfo(this.query.project_id, val)
+        this.item_name = projectInfo.item_name
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+
+      }, changeRangeValue(val) {
+        this.query.range_value = val
+        this.query.page = 1
+        // this.GetInspectionIndexTable(this.query)
+
+
+
+      }, GetInspectionIndexInit() {
+        GetInspectionIndexInit()
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              let project = []
+              let item = []
+              this.all_inspection_reference = resp.data.references
+
+              for (let i = 0; i < this.all_inspection_reference.length; i++) {
+                project.push(this.all_inspection_reference[i])
+              }
+              var obj = {}
+              //去重复
+              project = project.reduce((cur, next) => {
+                obj[next.project_id] ? '' : (obj[next.project_id] = true && cur.push(next))
+                return cur
+              }, [])
+
+              this.project_columns = project
+
+              for (let i = 0; i < this.all_inspection_reference.length; i++) {
+                if (this.all_inspection_reference[i].project_id == this.project_columns[0].project_id) {
+                  item.push(this.all_inspection_reference[i])
+                }
+              }
+              this.item_columns = item
+              this.item_name = item[0].item_name
+
+              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].id)
+              this.query.project_id = projectInfo.project_id
+              this.query.item_id = projectInfo.id
+              this.query.range_type = projectInfo.range_type
+              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+            } else {
+              this.$message.error(resp.msg)
+
+            }
+          })
+          .catch(error => {
+
+          })
+
+      },
+      getPojectInfo(project_id, item_id) {
+        for (let i = 0; i < this.all_inspection_reference.length; i++) {
+          if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].id == item_id) {
+            return this.all_inspection_reference[i]
+          }
+        }
+        return null
+      }, changeTime(val) {
+        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time)
+        if (time > 0) {
+          this.$message.error('结束时间不能小于开始时间')
+        } else {
+          // this.getDialysisList()
+          this.query.page = 1
+          this.GetInspectionIndexChart(this.query)
+          this.GetInspectionIndexTable(this.query)
+
+        }
+
+      },
+      changeEndTime(val) {
+        var time =
+          this.getTimestamp(val) - this.getTimestamp(this.query.start_time)
+        if (time < 0) {
+          this.$message.error('结束时间不能小于开始时间')
+        } else {
+          this.query.page = 1
+          this.GetInspectionIndexChart(this.query)
+          this.GetInspectionIndexTable(this.query)
+
+        }
+      }, GetRangeValue(range_type, project_id, id) {
+        let params = {
+          range_type: range_type,
+          project_id: project_id,
+          item_id: id
+        }
+        GetRangeValue(params)
+          .then(rs => {
+              var resp = rs.data
+              if (resp.state == 1) {
+                if (range_type == 1) {
+                  this.range_value_columns = []
+                  this.range_value_columns.push('全部')
+                  this.range_value_columns.push('小于' + resp.data.range_vaule[0])
+                  this.range_value_columns.push(resp.data.range_vaule[0] + '~' + resp.data.range_vaule[1])
+                  this.range_value_columns.push('大于' + resp.data.range_vaule[1])
+                  this.query.range_value = '全部'
+
+                } else {
+                  this.range_value_columns = []
+                  this.range_value_columns.push('全部')
+                  for (let i = 0; i < resp.data.range_vaule.length; i++) {
+                    this.range_value_columns.push(resp.data.range_vaule[i])
+                  }
+                  this.query.range_value = '全部'
+                }
+
+                this.GetPatientInspectionIndexBarChart(this.query)
+                this.GetPatientInspectionIndexChart(this.query)
+
+              } else {
+                this.$message.error(resp.msg)
+
+              }
+            }
+          )
+          .catch(error => {
+
+          })
+      },
+      GetPatientInspectionIndexBarChart(params) {
+        this.options.xAxis.data = []
+        this.options.series[0].data = []
+        GetPatientInspectionIndexBarChart(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              for (let i = 0; i < resp.data.data.length; i++) {
+                this.options.xAxis.data.push(resp.data.data[i].name)
+                this.options.series[0].data.push(resp.data.data[i].total)
+                this.percent.push(resp.data.data[i].ratio)
+
+              }
+
+            } else {
+              this.$toast({
+                message: resp.msg
+              })
+            }
+          })
+          .catch(error => {
+
+          })
+
+      },
+      GetPatientInspectionIndexChart(params) {
+        this.options2.xAxis.data = []
+        this.options2.series[0].data = []
+        GetPatientInspectionIndexChart(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              for (let i = 0; i < resp.data.data.length; i++) {
+                this.options2.xAxis.data.push(resp.data.data[i].date)
+                this.options2.series[0].data.push(resp.data.data[i].value)
+              }
+
+            } else {
+
+            }
+          })
+          .catch(error => {
+
+          })
+
+      },   getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000;
+      },
+
+    }, created() {
+      var date = new Date()
+      var year = date.getFullYear() //获取完整的年份(4位)
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+      var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+      this.query.end_time = year + '-' + month + '-' + day
+      this.query.start_time = year + '-' + last_month + '-' + day
+
+
+      this.getCurrentOrgPatients()
+
     }
   }
-};
 </script>
 
 
 <style lang="scss" scoped>
-.tableTitle {
-  font-size: 16px;
-  color: #000;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
+  .tableTitle {
+    font-size: 16px;
+    color: #000;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
 </style>
 <style lang="scss">
-.page_personal {
+  .page_personal {
+
   .cell {
     text-align: center;
   }
+
   .el-button--medium {
     padding: 10px 8px;
   }
+
   .el-form-item {
     margin-bottom: 0;
   }
-}
+
+  }
 </style>

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -69,7 +69,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -88,7 +88,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData" style="width: 100%" :height="tableHeight" v-loading="loading">
+              <el-table :data="tableData" style="width: 100%"  v-loading="loading">
                 <el-table-column fixed label="监测时间" align="center">
                   <template slot-scope="scope">
                     <!--{{getTime(scope.row.operate_time)}}-->
@@ -229,11 +229,9 @@
           }
         },
         patientsData:[],
-        tableData: [
-        ],
         loading: false,
         search_value: '',
-        total: '',
+        total: 0,
         query: {
           patient_id: '',
           statistics_type: 1,
@@ -257,7 +255,7 @@
           { value: 12, name: '超滤量' },
         ],
         crumbs: [
-          { path: false, name: '科室质控' },
+          { path: false, name: '质控管理' },
           { path: false, name: '指标评估统计' },
           { path: false, name: '透析过程指标统计' }
         ],
@@ -418,10 +416,14 @@
       },
       handleSizeChange(limit) {
         this.query.limit = limit;
+        this.GetDialysisWatchTableData(this.query)
+
 
       },
       handleCurrentChange(page) {
         this.query.page = page;
+        this.GetDialysisWatchTableData(this.query)
+
 
       },
       changeTime(val) {
@@ -482,12 +484,6 @@
       },
       getModeName(mode_id){
         return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name: ""
-      },
-      changeTime() {
-
-      }, changeEndTime() {
-
-
       }, GetDialysisWatchTableData(params) {
         this.loading = true
         this.tableData = []
@@ -499,6 +495,8 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.total
+
             } else {
               this.loading = false
             }
@@ -515,17 +513,10 @@
           .then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
-              if (this.query.statistics_type != 9 && this.query.statistics_type != 10) {
                 for (let i = 0; i < resp.data.data.length; i++) {
                   this.chart.xAxis.data.push(resp.data.data[i].date)
                   this.chart.series[0].data.push(resp.data.data[i].value)
                 }
-              } else {
-                for (let i = 0; i < resp.data.data.length; i++) {
-                  this.bar.xAxis.data.push(resp.data.data[i].name)
-                  this.bar.series[0].data.push(resp.data.data[i].total)
-                }
-              }
             } else {
             }
           })
@@ -537,6 +528,11 @@
         this.query.page = 1
         this.GetDialysisWatchTableData(this.query)
         this.GetDialysisWatchChartData(this.query)
+        for (let i = 0;i < this.patientsData.length; i++){
+          if (this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
 
       },
       querySearchAsync(keyword, cb) {
@@ -561,14 +557,26 @@
           if(response.data.state == 1){
             var patients = response.data.data.patients
             this.patientsData = patients
+            this.GetDefaultPatient()
           }
         })
-      },
+      }, GetDefaultPatient() {
+        GetDefalutPatient().then(response => {
+          if (response.data.state == 1) {
+            var patient = response.data.data.patient
+            for (let i = 0;i < this.patientsData.length; i++){
+              if (this.patientsData[i].id == patient.id){
+                this.$refs.table.setCurrentRow(this.patientsData[i])
+              }
+            }
+          }
+        })
+      }
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-      var day = date.getDate() < 0 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
       var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
       this.query.patient_id = 0
       this.query.end_time = year + '-' + month + '-' + day

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -0,0 +1,599 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">日期</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.state == stateType ? 'active' : ''"
+              @click="selectStateType(item.state)"
+              v-for="item in month"
+              :key="item.value"
+            >{{ item.label }}
+            </li>
+          </ul>
+        </div>
+        <el-date-picker
+          v-if="stateType == 5"
+          v-model="query.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        ></el-date-picker>
+        <span v-if="stateType == 5"
+              class>-</span>
+        <el-date-picker
+          v-if="stateType == 5"
+          v-model="query.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeEndTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        ></el-date-picker>
+      </div>
+      <el-container>
+        <div style="width:150px">
+          <div class="tableTitle">患者列表</div>
+          <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                    highlight-current-row
+                    @current-change="handleChange">
+            <el-table-column prop="dialysis_no" label="透析号" width="80">
+              <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+            </el-table-column>
+            <el-table-column prop="name" label="姓名" width="80">
+              <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+          </el-table>
+
+        </div>
+        <div style="padding-left:10px;flex:1">
+          <div class="tableTitle">统计图</div>
+          <div>
+            <!--<line-chart :options="options2"></line-chart>-->
+            <line-chart :options="options2"></line-chart>
+
+          </div>
+        </div>
+      </el-container>
+    </div>
+  </div>
+</template>
+
+
+<script>
+
+  const moment = require('moment')
+  import echarts from 'echarts'
+  import LineChart from '../../qcd/components/LineChart'
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getCurrentOrgPatients } from '@/api/common/common'
+  import {
+    GetDefalutPatient,
+    GetInspectionIndexChart,
+    GetInspectionIndexInit,
+    GetInspectionIndexTable,
+    GetPatientInspectionIndexBarChart,
+    GetPatientInspectionIndexChart,
+    GetRangeValue
+  } from '@/api/common/statistics'
+
+  export default {
+    name: 'dialysisTotal',
+    components: {
+      LineChart,
+      BreadCrumb
+    },
+    data() {
+      return {
+        custom_chart_data_color: [],
+        options2: {
+          title: {
+            text: 'ECharts 入门示例'
+          },
+          tooltip: {},
+          legend: {
+            data: ['次数'],
+            left: 0
+          },
+          xAxis: {
+            data: [],
+            axisLine: {
+              lineStyle: {
+                color: '#FF0000',
+                width: 8 //这里是为了突出显示加上的
+              }
+            },
+            axisLabel: {
+              interval: 0,
+              formatter: function(value) {
+                var ret = '' //拼接加\n返回的类目项
+                var maxLength = 8 //每项显示文字个数
+                var valLength = value.length //X轴类目项的文字个数
+                var rowN = Math.ceil(valLength / maxLength) //类目项需要换行的行数
+                if (rowN > 1) {
+                  //如果类目项的文字大于3,
+                  for (var i = 0; i < rowN; i++) {
+                    var temp = '' //每次截取的字符串
+                    var start = i * maxLength //开始截取的位置
+                    var end = start + maxLength //结束截取的位置
+                    //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
+                    temp = value.substring(start, end) + '\n'
+                    ret += temp //凭借最终的字符串
+                  }
+                  return ret
+                } else {
+                  return value
+                }
+              }
+            }
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
+            },
+            show: false,
+            axisLine: {
+              lineStyle: {
+                color: '#00FF00',
+                width: 8 //这里是为了突出显示加上的
+              }
+            }
+          },
+          series: [
+            {
+              name: '',
+              type: 'line',
+              data: [],
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: 'top',
+                  formatter: '{c}'
+                }
+              },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
+
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: function(params) {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = [
+                      ['#A9E0F3', '#9FBDFC'],
+
+                      ['#FFD7C0', '#FF9994']
+                    ]
+
+                    var index = params.dataIndex
+                    if (params.dataIndex >= colorList.length) {
+                      index = params.dataIndex % colorList.length
+                    }
+
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      { offset: 0, color: colorList[index][0] },
+                      // { offset: 0.5, color: colorList[index][1] },
+                      { offset: 1, color: colorList[index][1] }
+                    ])
+                  },
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
+                },
+
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        },
+        query: {
+          patient_id: this.$route.query.patient_id,
+          start_time: '',
+          end_time: '',
+          limit: 20,
+          page: 1,
+          project_id: this.$route.query.project_id,
+          item_id: this.$route.query.item_id,
+          range_type: this.$route.query.range_type,
+          range_value: ''
+        },
+        patientsData: [],
+
+        pickerOptions: {
+          disabledDate(time) {
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            return time.getTime() > Date.now() || time.getTime() < threeMonths
+
+          }
+        },
+        crumbs: [
+          { path: false, name: '质控管理' },
+          { path: false, name: '基本信息统计' }
+        ],
+        listQuery: {
+          start_time: '',
+          end_time: '',
+          page: 1,
+          limit: 10
+        },
+        stateType: 1,
+        month: [
+          { value: 1, label: '本月', state: 1 },
+          { value: 2, label: '近三个月', state: 2 },
+          { value: 3, label: '近半年', state: 3 },
+          { value: 4, label: '近一年', state: 4 },
+          { value: 5, label: '自定义', state: 5 }
+        ]
+      }
+    },
+    methods: {
+      selectStateType(val) {
+        this.stateType = val
+        switch (val) {
+          case 1: //本月
+
+            this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
+            // 本月的结束时间
+            this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
+            this.query.patient_id = this.$route.query.patient_id
+            this.query.project_id = this.$route.query.project_id
+            this.query.item_id = this.$route.query.item_id
+            this.query.range_type = this.$route.query.range_type
+            this.GetPatientInspectionIndexChart(this.query)
+
+            break
+          case 2: //近3个月
+            const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
+            this.query.start_time = startDate
+            const endDate = moment(new Date()).format('YYYY-MM-DD')
+            this.query.patient_id = this.$route.query.patient_id
+            this.query.project_id = this.$route.query.project_id
+            this.query.item_id = this.$route.query.item_id
+            this.query.range_type = this.$route.query.range_type
+
+            this.GetPatientInspectionIndexChart(this.query)
+
+            break
+          case 3: //近半年
+            this.query.start_time = moment().subtract('month', 6).format('YYYY-MM-DD')
+            this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
+            this.query.patient_id = this.$route.query.patient_id
+            this.query.project_id = this.$route.query.project_id
+            this.query.item_id = this.$route.query.item_id
+            this.query.range_type = this.$route.query.range_type
+
+            this.GetPatientInspectionIndexChart(this.query)
+            break
+          case 4: //近一年
+            this.query.start_time = moment().subtract('month', 12).format('YYYY-MM-DD')
+            this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
+            this.query.patient_id = this.$route.query.patient_id
+            this.query.project_id = this.$route.query.project_id
+            this.query.item_id = this.$route.query.item_id
+            this.query.range_type = this.$route.query.range_type
+            this.GetPatientInspectionIndexChart(this.query)
+            break
+          case 5: //自定义
+            this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
+            // 本月的结束时间
+            this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
+            this.query.patient_id = this.$route.query.patient_id
+            this.query.project_id = this.$route.query.project_id
+            this.query.item_id = this.$route.query.item_id
+            this.query.range_type = this.$route.query.range_type
+            this.GetPatientInspectionIndexChart(this.query)
+            break
+        }
+
+      },
+      getCurrentOrgPatients() {
+        getCurrentOrgPatients().then(response => {
+          if (response.data.state == 1) {
+            var patients = response.data.data.patients
+            this.patientsData = patients
+
+
+            for (let i = 0;i < this.patientsData.length; i++){
+              if (this.patientsData[i].id == this.query.patient_id){
+                this.$refs.table.setCurrentRow(this.patientsData[i])
+              }
+            }
+
+          }
+        })
+      }, handleChange(val) {
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetPatientInspectionIndexChart(this.query)
+      }, changeTime(val) {
+        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time)
+        if (time > 0) {
+          this.$message.error('结束时间不能小于开始时间')
+        } else {
+          console.log(this.query)
+          this.GetPatientInspectionIndexChart(this.query)
+        }
+      },
+      changeEndTime(val) {
+        var time =
+          this.getTimestamp(val) - this.getTimestamp(this.query.start_time)
+        if (time < 0) {
+          this.$message.error('结束时间不能小于开始时间')
+        } else {
+          console.log(this.query)
+          this.GetPatientInspectionIndexChart(this.query)
+
+        }
+      },
+      GetPatientInspectionIndexChart(params) {
+        this.options2.xAxis.data = []
+        this.options2.series[0].data = []
+        GetPatientInspectionIndexChart(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+
+              let tempData = []
+              let otherData = []
+
+              for (let i = 0; i < resp.data.data.length; i++) {
+                this.options2.xAxis.data.push(resp.data.data[i].date)
+
+                if (this.query.range_type == 1) {
+                  this.options2.series[0].data.push(resp.data.data[i].value)
+                } else {
+                  this.options2.series[0].data.push('1')
+                  tempData.push(resp.data.data[i].value)
+                  otherData.push(resp.data.data[i].value)
+                }
+              }
+
+              //获取无法确定选项的颜色
+              if (this.query.range_type == 2) {
+                //去重复
+                let obj = {}
+                tempData = tempData.reduce((cur, next) => {
+                  obj[next] ? '' : (obj[next] = true && cur.push(next))
+                  return cur
+                }, [])
+
+                //随机获取颜色值
+                let newObj = {}
+                for (let i = 0; i < tempData.length; i++) {
+                  newObj[tempData[i]] = this.getColor()
+                }
+
+                //匹配对应的颜色值
+                for (let i = 0; i < otherData.length; i++) {
+                  for (let key in newObj) {
+                    if (otherData[i] === key) {
+                      this.custom_chart_data_color.push(newObj[key])
+                    }
+                  }
+                }
+              }
+
+            } else {
+            }
+          })
+          .catch(error => {
+
+          })
+
+      },  getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000;
+      },
+
+    },
+    created() {
+
+      this.getCurrentOrgPatients()
+      this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
+      this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
+      this.query.patient_id = this.$route.query.patient_id
+      this.query.project_id = this.$route.query.project_id
+      this.query.item_id = this.$route.query.item_id
+      this.query.range_type = this.$route.query.range_type
+      this.GetPatientInspectionIndexChart(this.query)
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .tableTitle {
+    font-size: 16px;
+    color: #000;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+
+  .infoBox {
+    display: flex;
+    flex-wrap: wrap;
+
+  .infoOne {
+    margin-right: 30px;
+    margin-top: 30px;
+
+  .titleBox {
+    display: flex;
+    align-items: center;
+  }
+
+  .point {
+    display: inline-block;
+    width: 7px;
+    height: 7px;
+    background: linear-gradient(
+      90deg,
+      rgba(169, 224, 243, 1),
+      rgba(159, 189, 252, 1)
+    );
+    border-radius: 50%;
+  }
+
+  .point1 {
+    width: 7px;
+    height: 7px;
+    background: linear-gradient(
+      90deg,
+      rgba(255, 215, 192, 1),
+      rgba(255, 153, 148, 1)
+    );
+    border-radius: 50%;
+  }
+
+  .point2 {
+    width: 7px;
+    height: 7px;
+    background: linear-gradient(
+      90deg,
+      rgba(215, 195, 253, 1),
+      rgba(179, 168, 247, 1)
+    );
+    border-radius: 50%;
+  }
+
+  .infoTitle {
+    font-size: 16px;
+    font-weight: bold;
+    margin-left: 5px;
+    color: #000;
+  }
+
+  .borderBox {
+    width: 340px;
+    min-height: 140px;
+    background: rgba(255, 255, 255, 1);
+    border: 1px solid rgba(229, 229, 229, 1);
+    border-radius: 10px;
+    padding: 0 14px 20px;
+    margin-top: 10px;
+
+  p {
+    font-size: 14px;
+    color: #000;
+    margin: 10px 0 3px;
+  }
+
+  }
+  .borderBox1 {
+    width: 340px;
+    min-height: 140px;
+    background: rgba(255, 255, 255, 1);
+    border: 1px solid rgba(229, 229, 229, 1);
+    border-radius: 10px;
+    padding: 0 14px 20px;
+    margin-top: 10px;
+
+  p {
+    font-size: 14px;
+    color: #000;
+    margin: 10px 0 3px;
+  }
+
+  }
+  .borderBox2 {
+    width: 340px;
+    min-height: 140px;
+    background: rgba(255, 255, 255, 1);
+    border: 1px solid rgba(229, 229, 229, 1);
+    border-radius: 10px;
+    padding: 0 14px 20px;
+    margin-top: 10px;
+
+  p {
+    font-size: 14px;
+    color: #000;
+    margin: 10px 0 3px;
+  }
+
+  }
+  }
+  }
+</style>
+
+<style lang="scss">
+  .infoBox {
+
+  .infoOne {
+
+  .borderBox {
+
+  .el-progress-bar__inner {
+    background: linear-gradient(
+      90deg,
+      rgba(169, 224, 243, 1),
+      rgba(159, 189, 252, 1)
+    );
+  }
+
+  .el-progress-bar {
+    margin-right: -59px;
+    padding-right: 60px;
+  }
+
+  }
+  .borderBox1 {
+
+  .el-progress-bar__inner {
+    background: linear-gradient(
+      90deg,
+      rgba(255, 215, 192, 1),
+      rgba(255, 153, 148, 1)
+    );
+  }
+
+  .el-progress-bar {
+    margin-right: -59px;
+    padding-right: 60px;
+  }
+
+  }
+  .borderBox2 {
+
+  .el-progress-bar__inner {
+    background: linear-gradient(
+      90deg,
+      rgba(215, 195, 253, 1),
+      rgba(179, 168, 247, 1)
+    );
+  }
+
+  .el-progress-bar {
+    margin-right: -59px;
+    padding-right: 60px;
+  }
+
+  }
+  }
+  }
+</style>
+
+

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -26,7 +26,8 @@
 
             </el-form-item>
           </el-form>
-          <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px" @change="changeProject">
+          <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px"
+                     @change="changeProject">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -69,7 +70,8 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500"
+                      :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -84,16 +86,17 @@
           <div style="padding-left:10px;flex:1">
             <div class="tableTitle">指标趋势</div>
             <div>
-              <line-chart :options="chart" v-if="query.statistics_type != 9 && query.statistics_type != 10"></line-chart>
+              <line-chart :options="chart"
+                          v-if="query.statistics_type != 9 && query.statistics_type != 10"></line-chart>
               <line-chart :options="bar" v-if="query.statistics_type == 9 || query.statistics_type == 10"></line-chart>
 
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData"  :height="tableHeight"   v-loading="loading">
-                <el-table-column  fixed label="透析日期" align="center">
+              <el-table :data="tableData" v-loading="loading">
+                <el-table-column fixed label="透析日期" align="center">
                   <template slot-scope="scope">
-                    {{scope.row.schedule_date | parseTime("{y}-{m}-{d}") }}
+                    {{scope.row.schedule_date | parseTime('{y}-{m}-{d}') }}
                     <!--{{getTime(scope.row.schedule_date)}}-->
                   </template>
                 </el-table-column>
@@ -118,28 +121,32 @@
 
                 <el-table-column label="透前体重" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.predialysis_evaluation.weight_before?scope.row.predialysis_evaluation.weight_before:''}}
+                    {{
+                    scope.row.predialysis_evaluation.weight_before?scope.row.predialysis_evaluation.weight_before:''}}
 
                   </template>
                 </el-table-column>
 
                 <el-table-column label="透后体重" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.assessment_after_dislysis.weight_after ? scope.row.assessment_after_dislysis.weight_after :''}}
+                    {{ scope.row.assessment_after_dislysis.weight_after ?
+                    scope.row.assessment_after_dislysis.weight_after :''}}
 
                   </template>
                 </el-table-column>
 
                 <el-table-column label="目标超滤量" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.target_ultrafiltration ? scope.row.prescription.target_ultrafiltration : ''}}
+                    {{ scope.row.prescription.target_ultrafiltration ? scope.row.prescription.target_ultrafiltration :
+                    ''}}
 
                   </template>
                 </el-table-column>
 
                 <el-table-column label="实际超滤量" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.assessment_after_dislysis.actual_ultrafiltration ?  scope.row.assessment_after_dislysis.actual_ultrafiltration :''}}
+                    {{ scope.row.assessment_after_dislysis.actual_ultrafiltration ?
+                    scope.row.assessment_after_dislysis.actual_ultrafiltration :''}}
 
                   </template>
                 </el-table-column>
@@ -147,7 +154,11 @@
 
                 <el-table-column label="透前血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.predialysis_evaluation.systolic_blood_pressure && scope.row.predialysis_evaluation.diastolic_blood_pressure">{{ scope.row.predialysis_evaluation.systolic_blood_pressure}} / {{ scope.row.predialysis_evaluation.diastolic_blood_pressure}}</div>
+                    <div
+                      v-if="scope.row.predialysis_evaluation.systolic_blood_pressure && scope.row.predialysis_evaluation.diastolic_blood_pressure">
+                      {{ scope.row.predialysis_evaluation.systolic_blood_pressure}} / {{
+                      scope.row.predialysis_evaluation.diastolic_blood_pressure}}
+                    </div>
 
 
                   </template>
@@ -155,7 +166,11 @@
 
                 <el-table-column label="透后血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.assessment_after_dislysis.systolic_blood_pressure&&scope.row.assessment_after_dislysis.diastolic_blood_pressure">{{ scope.row.assessment_after_dislysis.systolic_blood_pressure}} / {{ scope.row.assessment_after_dislysis.diastolic_blood_pressure}}</div>
+                    <div
+                      v-if="scope.row.assessment_after_dislysis.systolic_blood_pressure&&scope.row.assessment_after_dislysis.diastolic_blood_pressure">
+                      {{ scope.row.assessment_after_dislysis.systolic_blood_pressure}} / {{
+                      scope.row.assessment_after_dislysis.diastolic_blood_pressure}}
+                    </div>
 
 
                   </template>
@@ -164,14 +179,16 @@
 
                 <el-table-column label="透前脉率" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.predialysis_evaluation.pulse_frequency?scope.row.predialysis_evaluation.pulse_frequency:''}}
+                    {{
+                    scope.row.predialysis_evaluation.pulse_frequency?scope.row.predialysis_evaluation.pulse_frequency:''}}
 
                   </template>
                 </el-table-column>
 
                 <el-table-column label="透后脉率" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.assessment_after_dislysis.pulse_frequency?scope.row.assessment_after_dislysis.pulse_frequency:''}}
+                    {{
+                    scope.row.assessment_after_dislysis.pulse_frequency?scope.row.assessment_after_dislysis.pulse_frequency:''}}
 
                   </template>
                 </el-table-column>
@@ -193,16 +210,15 @@
 
                 <el-table-column label="钾" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.kalium?scope.row.prescription.kalium:""}}
+                    {{ scope.row.prescription.kalium?scope.row.prescription.kalium:''}}
 
                   </template>
                 </el-table-column>
 
 
-
                 <el-table-column label="钠" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.sodium?scope.row.prescription.sodium:""}}
+                    {{ scope.row.prescription.sodium?scope.row.prescription.sodium:''}}
 
                   </template>
                 </el-table-column>
@@ -210,7 +226,7 @@
 
                 <el-table-column label="钙" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.calcium?scope.row.prescription.calcium:""}}
+                    {{ scope.row.prescription.calcium?scope.row.prescription.calcium:''}}
 
                   </template>
                 </el-table-column>
@@ -218,8 +234,10 @@
 
                 <el-table-column label="透析时长" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.prescription.dialysis_duration_hour?scope.row.prescription.dialysis_duration_hour+'小时':""}}
-                    {{ scope.row.prescription.dialysis_duration_minute?scope.row.prescription.dialysis_duration_minute+'分钟':''}}
+                    {{
+                    scope.row.prescription.dialysis_duration_hour?scope.row.prescription.dialysis_duration_hour+'小时':''}}
+                    {{
+                    scope.row.prescription.dialysis_duration_minute?scope.row.prescription.dialysis_duration_minute+'分钟':''}}
                   </template>
 
                 </el-table-column>
@@ -265,21 +283,17 @@
   import NewNav from '../indicatorControlAnalysis/components/NewNav'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import LineChart from '../../qcd/components/LineChart'
-  import { getCurrentOrgPatients } from "@/api/common/common";
+  import { getCurrentOrgPatients } from '@/api/common/common'
   import {
-    GetDefalutPatient,
+    GetDefaultPatient,
     GetDialysisProcessIndexChartData,
     GetDialysisProcessIndexTableData
   } from '@/api/common/statistics'
 
+  import { PostSearch } from '@/api/patient'
 
-
-  import {
-    PostSearch
-  } from '@/api/patient'
-
-  import { uParseTime } from "@/utils/tools";
-  import { getDataConfig } from "@/utils/data";
+  import { uParseTime } from '@/utils/tools'
+  import { getDataConfig } from '@/utils/data'
 
   export default {
     components: {
@@ -291,16 +305,17 @@
       return {
         pickerOptions: {
           disabledDate(time) {
-            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
-            return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            return time.getTime() > Date.now() || time.getTime() < threeMonths
+
           }
         },
-        patientsData:[],
-        tableData: [
-        ],
+        percent:[],
+        patientsData: [],
+        tableData: [],
         loading: false,
         search_value: '',
-        total: '',
+        total: 0,
         query: {
           patient_id: '',
           statistics_type: 1,
@@ -326,7 +341,6 @@
           { path: false, name: '指标评估统计' },
           { path: false, name: '透析过程指标统计' }
         ],
-        tableData: [],
         tableData1: [],
         chart: {
           title: {
@@ -356,7 +370,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -425,7 +449,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}次'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -469,39 +503,39 @@
       }
     },
     methods: {
-      jumpDetail(patient_id){
-        this.$router.push("/dqc/bloodpressure/detail?id="+patient_id)
 
-      },
-      changeProject(val){
+      changeProject(val) {
         this.query.statistics_type = val
         this.query.page = 1
         this.GetDialysisProcessIndexChartData(this.query)
         // this.GetDialysisProcessIndexTableData(this.query)
 
       },
-      handleChange(val){
+      handleChange(val) {
         this.query.patient_id = val.id
         this.query.page = 1
         this.GetDialysisProcessIndexTableData(this.query)
         this.GetDialysisProcessIndexChartData(this.query)
       },
       handleSizeChange(limit) {
-        this.query.limit = limit;
+        this.query.limit = limit
+        this.GetDialysisProcessIndexTableData(this.query)
 
       },
       handleCurrentChange(page) {
-        this.query.page = page;
+        this.query.page = page
+        this.GetDialysisProcessIndexTableData(this.query)
+
 
       },
       changeTime(val) {
-        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time)
         if (time > 0) {
-          this.$message.error("结束时间不能小于开始时间");
-          this.query.start_time = "";
+          this.$message.error('结束时间不能小于开始时间')
+          this.query.start_time = ''
         } else {
           // this.getDialysisList()
-          this.query.page = 1;
+          this.query.page = 1
           this.GetDialysisProcessIndexChartData(this.query)
           this.GetDialysisProcessIndexTableData(this.query)
 
@@ -510,12 +544,12 @@
       },
       changeEndTime(val) {
         var time =
-          this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
+          this.getTimestamp(val) - this.getTimestamp(this.query.start_time)
         if (time < 0) {
-          this.$message.error("结束时间不能小于开始时间");
-          this.query.end_time = "";
+          this.$message.error('结束时间不能小于开始时间')
+          this.query.end_time = ''
         } else {
-          this.query.page = 1;
+          this.query.page = 1
           this.GetDialysisProcessIndexChartData(this.query)
           this.GetDialysisProcessIndexTableData(this.query)
 
@@ -523,23 +557,23 @@
       },
       getTimestamp(time) {
         // 把时间日期转成时间戳
-        return new Date(time).getTime() / 1000;
+        return new Date(time).getTime() / 1000
       },
       QueryOperaById: function(val) {
-        let vascular_access_desc_name = "";
+        let vascular_access_desc_name = ''
         let vascular_access_desc = getDataConfig(
-          "hemodialysis",
-          "vascular_access_desc"
-        );
+          'hemodialysis',
+          'vascular_access_desc'
+        )
         for (let i = 0; i < vascular_access_desc.length; i++) {
           if (vascular_access_desc[i].id == val) {
-            vascular_access_desc_name = vascular_access_desc[i].name;
+            vascular_access_desc_name = vascular_access_desc[i].name
           }
         }
 
-        return vascular_access_desc_name;
+        return vascular_access_desc_name
       },
-      GetAnticoagulantById: function (val) {
+      GetAnticoagulantById: function(val) {
         let anticoagulan_name = ''
         var anticoagulantsConfitTwo = this.$store.getters.anticoagulants_confit
         let anticoagulant = anticoagulantsConfitTwo
@@ -550,26 +584,21 @@
         }
         return anticoagulan_name
       },
-      getModeName(mode_id){
-        return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name: ""
-      },
-      changeTime() {
-
-      }, changeEndTime() {
-
-
+      getModeName(mode_id) {
+        return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name : ''
       }, GetDialysisProcessIndexTableData(params) {
         this.loading = true
-        this.tableData = []
         GetDialysisProcessIndexTableData(params)
           .then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
               this.loading = false
-
+              this.tableData = []
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.total
+
             } else {
               this.loading = false
             }
@@ -583,7 +612,9 @@
         this.chart.series[0].data = []
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
-        GetDialysisProcessIndexChartData(params)
+        this.percent = []
+
+          GetDialysisProcessIndexChartData(params)
           .then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
@@ -593,12 +624,12 @@
                   this.chart.series[0].data.push(resp.data.data[i].value)
                 }
               } else {
-                console.log("1111111")
-                console.log(this.query.statistics_type)
 
                 for (let i = 0; i < resp.data.data.length; i++) {
                   this.bar.xAxis.data.push(resp.data.data[i].name)
                   this.bar.series[0].data.push(resp.data.data[i].total)
+                  this.percent.push(resp.data.data[i].ratio)
+
                 }
               }
             } else {
@@ -613,6 +644,13 @@
         this.GetDialysisProcessIndexChartData(this.query)
         this.GetDialysisProcessIndexTableData(this.query)
 
+        for (let i = 0;i < this.patientsData.length; i++){
+          if (this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
+
+
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -631,19 +669,32 @@
       },
       chooseWay(way) {
         this.wayType = way
-      }, getCurrentOrgPatients(){
-        getCurrentOrgPatients().then(response=>{
-          if(response.data.state == 1){
+      }, getCurrentOrgPatients() {
+        getCurrentOrgPatients().then(response => {
+          if (response.data.state == 1) {
             var patients = response.data.data.patients
             this.patientsData = patients
+            this.GetDefaultPatient()
           }
         })
-      },
+      }, GetDefaultPatient() {
+        GetDefaultPatient().then(response => {
+          if (response.data.state == 1) {
+            var patient = response.data.data.patient
+            for (let i = 0;i < this.patientsData.length; i++){
+              if (this.patientsData[i].id == patient.id){
+                this.$refs.table.setCurrentRow(this.patientsData[i])
+              }
+            }
+          }
+        })
+
+      }
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-      var day = date.getDate() < 0 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
       var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
       this.query.patient_id = 0
       this.query.end_time = year + '-' + month + '-' + day

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -69,7 +69,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
@@ -138,7 +138,7 @@
 
                 <el-table-column label="体重增加" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.weight_before && scope.row.last_after_weight">{{scope.row.weight_before - scope.row.last_after_weight}}</div>
+                    <div v-if="scope.row.weight_before && scope.row.last_after_weight">{{(scope.row.weight_before - scope.row.last_after_weight).toFixed(1)}}</div>
 
                     <!--{{scope.row.weight_before - scope.row.last_after_weight}}-->
                     <!--<div v-if="scope.row.after.systolic_blood_pressure"> {{ scope.row.after.systolic_blood_pressure}} /{{scope.row.after.diastolic_blood_pressure}}</div>-->
@@ -184,7 +184,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import LineChart from '../../qcd/components/LineChart'
   import { getCurrentOrgPatients } from "@/api/common/common";
-  import {GetDialysisWeightChartData,GetDialysisWeightTableData} from "@/api/common/statistics"
+  import {GetDialysisWeightChartData,GetDialysisWeightTableData,GetDefalutPatient} from "@/api/common/statistics"
 
   import {
     PostSearch
@@ -201,6 +201,7 @@
     },
     data() {
       return {
+        percent:[],
         pickerOptions: {
           disabledDate(time) {
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
@@ -212,7 +213,7 @@
         ],
         loading: false,
         search_value: '',
-        total: '',
+        total: 0,
         query: {
           patient_id: '',
           statistics_type: 1,
@@ -228,7 +229,7 @@
           { value: 4, name: '透后体重' },
         ],
         crumbs: [
-          { path: false, name: '科室质控' },
+          { path: false, name: '质控管理' },
           { path: false, name: '指标评估统计' },
           { path: false, name: '透析过程指标统计' }
         ],
@@ -261,7 +262,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -330,7 +341,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}次'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -375,6 +396,10 @@
       }
     },
     methods: {
+      jumpDetail(patient_id){
+        this.$router.push("/qcd/indicatorControlAnalysis/weightDetails?id="+patient_id)
+
+      },
       changeProject(val){
         this.query.statistics_type = val
         this.query.page = 1
@@ -389,10 +414,12 @@
       },
       handleSizeChange(limit) {
         this.query.limit = limit;
+        this.GetDialysisWeightTableData(this.query)
 
       },
       handleCurrentChange(page) {
         this.query.page = page;
+        this.GetDialysisWeightTableData(this.query)
 
       },
       changeTime(val) {
@@ -453,12 +480,6 @@
       },
       getModeName(mode_id){
         return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name: ""
-      },
-      changeTime() {
-
-      }, changeEndTime() {
-
-
       }, GetDialysisWeightTableData(params) {
         this.loading = true
         this.tableData = []
@@ -471,6 +492,8 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.tableData.push(resp.data.data[i])
               }
+              this.total = resp.data.total
+
             } else {
               this.loading = false
             }
@@ -482,6 +505,8 @@
       GetDialysisWeightChartData(params) {
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
+        this.percent = []
+
         GetDialysisWeightChartData(params)
           .then(rs => {
             var resp = rs.data
@@ -489,6 +514,9 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.bar.xAxis.data.push(resp.data.data[i].name)
                 this.bar.series[0].data.push(resp.data.data[i].total)
+                this.percent.push(resp.data.data[i].ratio)
+
+
               }
             } else {
             }
@@ -501,6 +529,11 @@
         this.query.page = 1
         this.GetDialysisWeightChartData(this.query)
         this.GetDialysisWeightTableData(this.query)
+        for (let i = 0;i < this.patientsData.length; i++){
+          if (this.patientsData[i].id == val.id){
+            this.$refs.table.setCurrentRow(this.patientsData[i])
+          }
+        }
 
       },
       querySearchAsync(keyword, cb) {
@@ -525,14 +558,21 @@
           if(response.data.state == 1){
             var patients = response.data.data.patients
             this.patientsData = patients
+
           }
         })
-      },
+      },GetDefaultPatient() {
+        GetDefalutPatient().then(response => {
+          if (response.data.state == 1) {
+            var patient = response.data.data.patient
+          }
+        })
+      }
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-      var day = date.getDate() < 0 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
       var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
       this.query.patient_id = 0
       this.query.end_time = year + '-' + month + '-' + day

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -8,47 +8,66 @@
         <div class="cell clearfix" style="margin:0">
           <el-form :inline="true" :model="listQuery">
             <el-form-item label>
-              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+              <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model="search_value"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入病人名字"
+                @select="handleSelect"
+              >
+                <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+              </el-autocomplete>
+
             </el-form-item>
           </el-form>
         </div>
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-              <el-table-column prop="date" label="日期" width="70"></el-table-column>
-              <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+            <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      highlight-current-row
+                      @current-change="handleChange">
+              <el-table-column prop="dialysis_no" label="透析号" width="80">
+                <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+              </el-table-column>
+              <el-table-column prop="name" label="姓名" width="80">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+              </el-table-column>
             </el-table>
+
+
           </div>
           <div class="containerRight" style="flex:1;overflow: hidden">
             <div class="cell clearfix">
               <label class="title" style="text-align:left">
-                <span class="name">血压阶段</span> :
+                <span class="name">体重类型</span> :
               </label>
-              <el-select
-                v-model="value"
-                placeholder="请选择"
-                @change="chooseType"
-                style="width:110px;margin-right:10px"
-              >
+              <el-select v-model="query.statistics_type" placeholder="请选择" style="width:110px;margin-right:10px" @change="changeProject">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
+
                 ></el-option>
               </el-select>
               <label class="title">
                 <span class="name">日期查询</span> :
               </label>
               <el-date-picker
-                v-model="listQuery.start_time"
+                v-model="query.start_time"
                 prefix-icon="el-icon-date"
                 @change="changeTime"
                 :editable="false"
+                style="width: 150px;"
                 type="date"
-                style="max-width:160px"
+                :picker-options="pickerOptions"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -56,12 +75,13 @@
               ></el-date-picker>
               <span class>-</span>
               <el-date-picker
-                v-model="listQuery.end_time"
+                v-model="query.end_time"
                 prefix-icon="el-icon-date"
                 @change="changeEndTime"
                 :editable="false"
+                :picker-options="pickerOptions"
+                style="width: 150px;"
                 type="date"
-                style="max-width:160px"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -74,18 +94,68 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-                <el-table-column fixed prop="date" label="日期"></el-table-column>
-                <el-table-column prop="name" label="姓名"></el-table-column>
-                <el-table-column prop="province" label="省份"></el-table-column>
-                <el-table-column prop="city" label="市区"></el-table-column>
+              <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+                <el-table-column fixed label="日期" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.assessment_date | parseTime("{y}-{m}-{d}") }}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="姓名" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.patient.name}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="干体重" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.dry_weight?scope.row.dry_weight:''}}
+
+                    <!--{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}-->
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="前次透后体重" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.last_after_weight?scope.row.last_after_weight:''}}
+
+                    <!--<div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>-->
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透前体重" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.weight_before?scope.row.weight_before:''}}
+
+                    <!--<div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>-->
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透后体重" align="center">
+                  <template slot-scope="scope">
+                    <!--<div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>-->
+                    {{scope.row.after.weight_after?scope.row.after.weight_after:''}}
+
+
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="体重增加" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.weight_before && scope.row.last_after_weight">{{(scope.row.weight_before - scope.row.last_after_weight).toFixed(1)}}</div>
+
+                    <!--{{scope.row.weight_before - scope.row.last_after_weight}}-->
+                    <!--<div v-if="scope.row.after.systolic_blood_pressure"> {{ scope.row.after.systolic_blood_pressure}} /{{scope.row.after.diastolic_blood_pressure}}</div>-->
+                  </template>
+                </el-table-column>
+
               </el-table>
 
               <el-pagination
                 align="right"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :current-page="listQuery.page"
+                :current-page="query.page"
                 :page-sizes="[10, 20, 50, 100]"
                 :page-size="10"
                 background
@@ -105,6 +175,13 @@
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../../qcd/components/LineChart";
+
+import { getCurrentOrgPatients } from "@/api/common/common";
+import {GetDialysisPatientWeightChartData,GetDialysisWeightTableData} from "@/api/common/statistics"
+import { PostSearch } from '@/api/patient'
+import { uParseTime } from "@/utils/tools";
+
+
 export default {
   components: {
     LineChart,
@@ -112,77 +189,48 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      },
+      patientsData:[],
+      tableData: [],
+      loading: false,
+      search_value: '',
+      total: 0,
+      query: {
+        patient_id: '',
+        statistics_type: 1,
+        start_time: '',
+        end_time: '',
+        limit: 10,
+        page: 1
+      },
+      options: [
+        { value: 1, name: '干体重' },
+        { value: 2, name: '透前体重' },
+        { value: 3, name: '体重增加' },
+        { value: 4, name: '透后体重' },
+      ],
+
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "患者血压详情" }
       ],
-      tableData: [
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        }
-      ],
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
+
       chart: {
         title: {
           text: "ECharts 入门示例"
         },
         tooltip: {},
         legend: {
-          data: ["透前体重", "透后体重"],
+          data: [],
           left: 0
         },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -192,25 +240,17 @@ export default {
         },
         series: [
           {
-            name: "透前体重",
+            name: "",
             type: "line",
             data: [
-              "78.57",
-              "50",
-              "80",
-              "93.33",
-              "92.86",
-              "100",
-              "12",
-              "77",
-              "37"
+
             ],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}"
               }
             },
             //配置样式
@@ -223,112 +263,8 @@ export default {
               }
             }
           },
-          {
-            name: "透后体重",
-            type: "line",
-            data: ["10", "20", "30", "53.33", "42.86", "100", "60", "27", "97"],
-            barWidth: 30,
-            label: {
-              normal: {
-                show: true,
-                position: "top",
-                formatter: "{c}次"
-              }
-            },
-            //配置样式
-            itemStyle: {
-              normal: {
-                color: "#dd7383", //折点颜色
-                lineStyle: {
-                  color: "#dd7383" //折线颜色
-                }
-              }
-            }
-          }
         ]
       },
-      tableData1: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ]
     };
   },
   methods: {
@@ -337,7 +273,151 @@ export default {
     },
     clickQuality(index) {
       this.quality = index;
-    }
+    },  changeProject(val){
+      this.query.statistics_type = val
+      this.query.page = 1
+      this.GetDialysisPatientWeightChartData(this.query)
+
+    },
+    handleChange(val){
+      this.query.patient_id = val.id
+      this.query.page = 1
+      this.GetDialysisWeightTableData(this.query)
+      this.GetDialysisPatientWeightChartData(this.query)
+    },
+    handleSizeChange(limit) {
+      this.query.limit = limit;
+      this.GetDialysisWeightTableData(this.query)
+
+
+    },
+    handleCurrentChange(page) {
+      this.query.page = page;
+      this.GetDialysisWeightTableData(this.query)
+
+
+    },
+    changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.start_time = "";
+      } else {
+        // this.getDialysisList()
+        this.query.page = 1;
+        this.GetDialysisPatientWeightChartData(this.query)
+        this.GetDialysisWeightTableData(this.query)
+
+      }
+
+    },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.end_time = "";
+      } else {
+        this.query.page = 1;
+        this.GetDialysisPatientWeightChartData(this.query)
+        this.GetDialysisWeightTableData(this.query)
+
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },GetDialysisWeightTableData(params) {
+      this.loading = true
+      GetDialysisWeightTableData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.loading = false
+            this.tableData = []
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.tableData.push(resp.data.data[i])
+            }
+            this.total = resp.data.total
+          } else {
+            this.loading = false
+          }
+        })
+        .catch(error => {
+
+        })
+    },
+    GetDialysisPatientWeightChartData(params) {
+      this.chart.xAxis.data = []
+      this.chart.series[0].data = []
+      GetDialysisPatientWeightChartData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.chart.xAxis.data.push(resp.data.data[i].date)
+              this.chart.series[0].data.push(parseFloat(resp.data.data[i].value).toFixed(1))
+            }
+          } else {
+          }
+        })
+        .catch(error => {
+        })
+    },
+    handleSelect(val) {
+      this.query.patient_id = val.id
+      this.query.page = 1
+      this.GetDialysisPatientWeightChartData(this.query)
+      this.GetDialysisWeightTableData(this.query)
+      for (let i = 0;i < this.patientsData.length; i++){
+        if (this.patientsData[i].id == val.id){
+          this.$refs.table.setCurrentRow(this.patientsData[i])
+        }
+      }
+
+    },
+    querySearchAsync(keyword, cb) {
+      let key = ''
+      if (keyword != undefined) {
+        key = keyword
+      }
+      let searchArray = []
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.patient
+          cb(searchArray)
+        } else {
+          cb([])
+        }
+      })
+    }, getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+        if(response.data.state == 1){
+          var patients = response.data.data.patients
+          this.patientsData = patients
+          for (let i = 0;i < this.patientsData.length; i++){
+            if (this.patientsData[i].id == this.query.patient_id){
+              this.$refs.table.setCurrentRow(this.patientsData[i])
+            }
+          }
+
+        }
+      })
+    },
+  },created() {
+    var date = new Date()
+    var year = date.getFullYear() //获取完整的年份(4位)
+    var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+    var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+    var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+    this.query.patient_id = this.$route.query.id
+    this.query.end_time = year + '-' + month + '-' + day
+    this.query.start_time = year + '-' + last_month + '-' + day
+    this.query.statistics_type = 1
+    this.GetDialysisPatientWeightChartData(this.query)
+    this.GetDialysisWeightTableData(this.query)
+    this.getCurrentOrgPatients()
+
   }
 };
 </script>

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -95,11 +95,11 @@ export default {
       options1: [
         {
           value: 1,
-          label: "按季度对比统计"
+          label: "按季度统计对比"
         },
         {
           value: 2,
-          label: "按月份对比统计"
+          label: "按月份统计对比"
         },
       ],
       value: "请选项",
@@ -202,7 +202,6 @@ export default {
     },
     chooseType(val) {
       this.type = val;
-      console.log("val",val)
       //按季度
       if(val == 1){
         this.getlist()
@@ -214,28 +213,34 @@ export default {
      
     },
     changeOptions(val){
+      
+     
+     if(this.type == 1){
+        this.lapseto = val
+        this.getlist()
+        return false
+     }
+
      if(this.type == 2){
+        this.lapseto = val
         this.getMonthList()
         return false
       }
-      this.lapseto = val
-      this.getlist()
+      
+ 
        
     },
     getNormData(){
         getNormData().then(response=>{
             var normdata = response.data.data.normdata
-            console.log("normdata",normdata)
             for(let i=0;i<normdata.length;i++){
              this.mode_type = normdata[0].inspection_minor
             }
             this.normdata = normdata
             this.getlist()
-           // this.getMonthList()
         })
     },
     handleModeType(val){
-       console.log("触发了额",this.type)
        if(this.type == 2){
         this.getMonthList()
         return false
@@ -250,30 +255,25 @@ export default {
          this.modesData.series = []
          this.modesData.xAxis = []
         const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
-       // console.log("本月开始时间",firstQuarterStart)
         const firstQuarterEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
-       // console.log("本月结束时间",firstQuarterEnd)
+  
 
         //第一季度
         const first_quarter_start =  moment().startOf('year').format('YYYY-MM-DD')
-       // console.log("第一季度",first_quarter_start)
         const first_qurter_end = moment().month(2).endOf('month').format("YYYY-MM-DD")
-      // console.log("第一季度",first_qurter_end)
+    
         //第二季度
         const second_qurter_start = moment().month(3).startOf('month').format("YYYY-MM-DD")
-      //  console.log("第二季度",second_qurter_start)
         const second_qurter_end = moment().month(5).endOf('month').format("YYYY-MM-DD")
-      //  console.log("第二季度",second_qurter_end)
+   
         //第三季度
         const three_qurter_start = moment().month(6).startOf('month').format("YYYY-MM-DD")
-      //  console.log("第三季度",three_qurter_start)
         const three_qurter_end = moment().month(8).endOf('month').format("YYYY-MM-DD")
-      //  console.log("第三季度",three_qurter_end)
+  
         //第四季度
          const four_qurter_start = moment().month(9).startOf('month').format("YYYY-MM-DD")
-      //  console.log("第四季度",four_qurter_start)
-        const four_qurter_end = moment().month(11).endOf('month').format("YYYY-MM-DD")
-      //  console.log("第四季度",four_qurter_end)
+         const four_qurter_end = moment().month(11).endOf('month').format("YYYY-MM-DD")
+ 
      
          const params = {
            lapseto:this.lapseto,
@@ -290,13 +290,12 @@ export default {
            four_qurter_start:four_qurter_start,
            four_qurter_end:four_qurter_end,
          }
-         console.log("params",params)
       getProjectList(params).then(response=>{
         if(response.data.state === 1){
           var list = response.data.data.list
-         // console.log("数据源",list)
+      
           var standList =  response.data.data.standList
-         // console.log("standList",standList)
+         
           var newArr = [
             {Total:"第一季度",Count:1,NoCount: 0},
             {Total:"第二季度",Count:1,NoCount: 0},
@@ -310,7 +309,7 @@ export default {
         arrTwo.map(item => {
               list.push(item)
            })
-        //  console.log("list",list)
+     
          
          for(let i=0;i<list.length;i++){
             if(list[i].Total == "第一季度"){
@@ -355,10 +354,6 @@ export default {
           standArr.map(item=>{
             standList.push(item)
           })
-         //  console.log("standList",standList)
-
-        
-       //  console.log("list-----",list)
          var arrFive = []
           for(let i=0;i<list.length;i++){
              for(let j=0;j<standList.length;j++){
@@ -369,7 +364,7 @@ export default {
              }
           }
         
-       // console.log("arrFive",arrFive)
+      
         
         for(const key in arrFive){
             this.modesData.xAxis.push(arrFive[key].Total);
@@ -379,13 +374,11 @@ export default {
 
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
-        //  console.log("222000",this.modesData)
+       
         }
       })
     },
      arrayDate(array1,array2){
-      //  console.log("array1",array1)
-      //  console.log("array2",array2)
         var array1 = array1;
         var array2 = array2;
         var result = [];
@@ -405,12 +398,9 @@ export default {
                 result.push(obj);
             }
         }
-      //  console.log("result",result)
         return result;
     },
     arrayDateTwo(array1,array2){
-      //   console.log("array1",array1)
-      //   console.log("array2",array2)
         var array1 = array1;
         var array2 = array2;
         var result = [];
@@ -430,12 +420,9 @@ export default {
                 result.push(obj);
             }
         }
-      //  console.log("resultTwo",result)
         return result;
     },
      arrayDateThree(array1,array2){
-        // console.log("array1",array1)
-        // console.log("array2",array2)
         var array1 = array1;
         var array2 = array2;
         var result = [];
@@ -455,12 +442,9 @@ export default {
                 result.push(obj);
             }
         }
-       console.log("resultThree",result)
         return result;
     },
     arrayDateFour(array1,array2){
-      //   console.log("array1",array1)
-      //   console.log("array2",array2)
         var array1 = array1;
         var array2 = array2;
         var result = [];
@@ -480,7 +464,6 @@ export default {
                 result.push(obj);
             }
         }
-      //  console.log("resultTwo",result)
         return result;
     },
      compare(property){
@@ -495,65 +478,53 @@ export default {
     getMonthList(){
          this.modesData.series = []
          this.modesData.xAxis = []
-        const januaryStart = moment().month(0).startOf('month').format("YYYY-MM-DD")
-        console.log("一月始",januaryStart)
-        const januaryEnd = moment().month(0).endOf('month').format("YYYY-MM-DD")
-        console.log("一月末",januaryEnd)
+         const januaryStart = moment().month(0).startOf('month').format("YYYY-MM-DD")
+         const januaryEnd = moment().month(0).endOf('month').format("YYYY-MM-DD")
+       
 
         const  febStart = moment().month(1).startOf('month').format("YYYY-MM-DD")
-        console.log("二月始",febStart)
         const febEnd = moment().month(1).endOf('month').format("YYYY-MM-DD")
-        console.log("二月末",febEnd)
+       
 
         const  marchStart = moment().month(2).startOf('month').format("YYYY-MM-DD")
-        console.log("三月始",marchStart)
         const marchEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-        console.log("三月末",marchEnd)
+  
 
         const  aprStart = moment().month(3).startOf('month').format("YYYY-MM-DD")
-        console.log("四月始",aprStart)
         const aprEnd = moment().month(3).endOf('month').format("YYYY-MM-DD")
-        console.log("四月末",aprEnd)
+   
 
         const  mayStart = moment().month(4).startOf('month').format("YYYY-MM-DD")
-        console.log("五月始",mayStart)
         const mayEnd = moment().month(4).endOf('month').format("YYYY-MM-DD")
-        console.log("五月末",mayEnd)
+        
 
         const  junStart = moment().month(5).startOf('month').format("YYYY-MM-DD")
-        console.log("六月始",junStart)
         const junEnd = moment().month(5).endOf('month').format("YYYY-MM-DD")
-        console.log("六月末",junEnd)
+     
 
         const  julStart = moment().month(6).startOf('month').format("YYYY-MM-DD")
-        console.log("7月始",julStart)
         const julEnd = moment().month(6).endOf('month').format("YYYY-MM-DD")
-        console.log("7月末",julEnd)
+     
 
         const  augStart = moment().month(7).startOf('month').format("YYYY-MM-DD")
-        console.log("8月始",augStart)
         const augEnd = moment().month(7).endOf('month').format("YYYY-MM-DD")
-        console.log("8月末",augEnd)
+
 
         const  sepStart = moment().month(8).startOf('month').format("YYYY-MM-DD")
-        console.log("9月始",sepStart)
         const sepEnd = moment().month(8).endOf('month').format("YYYY-MM-DD")
-        console.log("9月末",sepEnd)
+     
 
         const  octStart = moment().month(9).startOf('month').format("YYYY-MM-DD")
-        console.log("10月始",octStart)
         const octEnd = moment().month(9).endOf('month').format("YYYY-MM-DD")
-        console.log("10月末",octEnd)
+
 
         const  novStart = moment().month(10).startOf('month').format("YYYY-MM-DD")
-        console.log("11月始",novStart)
         const novEnd = moment().month(10).endOf('month').format("YYYY-MM-DD")
-        console.log("11月末",novEnd)
+   
         
         const  decStart = moment().month(11).startOf('month').format("YYYY-MM-DD")
-        console.log("12月始",decStart)
         const decEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
-        console.log("12月末",decEnd)
+  
         
         const params = {
           lapseto:this.lapseto,
@@ -584,11 +555,11 @@ export default {
           decStart:decStart,
           decEnd:decEnd,    
         }
-       console.log("params222222",params)
+    
        getMonthProjectList(params).then(response=>{
         if(response.data.state === 1){
             var monthlist = response.data.data.monthlist
-            console.log("monthlist++++++",monthlist)
+     
             var newArr = [
               {Total:"一月",Count:1,NoCount: 0},
               {Total:"二月",Count:1,NoCount: 0},
@@ -621,7 +592,7 @@ export default {
            
              //获取2个数组不同的部分
             var standArr = this.arrayDateThree(monthlist,newArr)  
-            console.log("standArr",standArr)
+          
             standArr.map(item=>{
                 monthlist.push(item)
               }) 
@@ -707,13 +678,12 @@ export default {
                   monthlist[i].Total = "十二月"
                 }
              }
-              console.log("monthlist-------------------------",monthlist)
-             var monthNolist = response.data.data.monthNolist
-             console.log("monthNolist",monthNolist)
              
-            var standArrTwo = this.arrayDateThree(monthNolist,newArrTwo)  
-             console.log("standArrTwo",standArrTwo)
-
+             var monthNolist = response.data.data.monthNolist
+            
+           
+             var standArrTwo = this.arrayDateThree(monthNolist,newArrTwo)  
+           
              standArrTwo.map(item=>{
                 monthNolist.push(item)
               }) 
@@ -729,7 +699,7 @@ export default {
                  }
                }
              }
-             console.log("arrOne",arrOne)
+          
               
             for(const key in arrOne){
               this.modesData.xAxis.push(arrOne[key].Total);

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -40,6 +40,7 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
@@ -53,11 +54,12 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
           ></el-date-picker>
         </div>
       </div>
       <div class="cell clearfix">
-        <div class="time newLi" v-if="type == '按季度对比统计'">
+        <div class="time newLi" v-if="type == '按季度统计对比'">
           <ul class>
             <li
               :class="item.state == quarterType ? 'active' : ''"
@@ -67,7 +69,7 @@
             >{{ item.label }}</li>
           </ul>
         </div>
-        <div class="time newLi" v-if="type == '按月份对比统计'">
+        <div class="time newLi" v-if="type == '按月份统计对比'">
           <ul class>
             <li
               :class="item.state == monthType ? 'active' : ''"
@@ -110,13 +112,22 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      },  
+      modetype:0,
+      startime:"",
+      endtime:"",
       activeName: "first",
       modesData: {
         xAxis: [],
         series: []
        },
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "科室质控达标统计" },
         { path: false, name: "按时间分组" }
       ],
@@ -145,19 +156,19 @@ export default {
       value: "请选项",
       options1: [
         {
-          value: "按季度对比统计",
-          label: "按季度对比统计"
+          value: "按季度统计对比",
+          label: "按季度统计对比"
         },
         {
-          value: "按月份对比统计",
-          label: "按月份对比统计"
+          value: "按月份统计对比",
+          label: "按月份统计对比"
         },
         {
           value: "自定义",
           label: "自定义"
         }
       ],
-      type: "按季度对比统计",
+      type: "按季度统计对比",
       quarter: [
         { value: 0, label: "第一季度", state: 0 },
         { value: 1, label: "第二季度", state: 1 },
@@ -190,7 +201,7 @@ export default {
           left: 0
         },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -202,17 +213,7 @@ export default {
           {
             name: "次数",
             type: "bar",
-            data: [
-              "78.57",
-              "50",
-              "80",
-              "93.33",
-              "92.86",
-              "100",
-              "12",
-              "77",
-              "37"
-            ],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
@@ -274,13 +275,29 @@ export default {
         this.$router.push({ path: "/qcd/officesControlAnalysis/project" });
       }
     },
-    changeTime() {},
+    changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.start_time = "";
+      } else {
+        this.getlist()
+      }
+
+    },
     changeLapseto(val){
-      console.log("val",val)
-      this.lapseto = val
-      const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
-      const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-      this.getFirstQuarter(val,firstQuarterStart,firstQuarterEnd)
+      if(val == 0){
+        this.lapseto = 0
+        this.getlist()
+      }
+      if(val == 1){
+       this.lapseto =1
+       this.getlist()
+      }
+      if(val == 2){
+        this.lapseto = 2
+        this.getlist()
+      }
     },
      
     changeEndTime(val) {
@@ -290,156 +307,269 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+        this.getlist()
       }
+    },
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     selectLapseTo(state) {
       this.stateType = state;
       this.listQuery.state = state;
     },
     chooseType(val) {
-      console.log(val);
       this.type = val;
+      if(val == "按月份统计对比"){
+         this.modetype = 0
+        
+      }
+       if(val == "按季度统计对比"){
+         this.modetype = 1
+         
+      }
+      if(val == "自定义"){
+        this.modetype = 2
+      }
+     
     },
     chooseQuarter(quarter) {
       this.quarterType = quarter;
       //第一季度
       if(quarter === 0){
-        //本月的开始时间
-        const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
-        const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,firstQuarterStart,firstQuarterEnd)
+         this.modetype = 0
+        this.getlist()
+        return false
       }
 
       //第二季度
       if(quarter === 1){
-        const febQuarterStart = moment().month(3).startOf('month').format("YYYY-MM-DD")
-        const fedQuarterEnd = moment().month(5).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,febQuarterStart,fedQuarterEnd)
+         this.modetype = 0
+         this.getlist()
+         return false
       }
 
       //第三季度
       if(quarter === 2){
-        const threeQuarterStart = moment().month(6).startOf('month').format("YYYY-MM-DD")
-        const threeQuarterEnd = moment().month(8).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,threeQuarterStart,threeQuarterEnd)
+        this.modetype = 0
+        this.getlist()
+        return false
       }
 
       //第四季度
       if(quarter === 3){
-        const fourQuarterStart = moment().month(8).startOf('month').format("YYYY-MM-DD")
-        const fourQuarterEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+       this.modetype = 0
+        this.getlist()
+        return false
       }
 
       
     },
-    chooseMonth(month) {
-      this.monthType = month;
-    
+    chooseMonth(month) {  
       //1月
       if(month == 0){
-          const fourQuarterStart = moment().month(0).startOf('month').format("YYYY-MM-DD")
-          console.log("fourQuarterStart",fourQuarterStart)
-          const fourQuarterEnd = moment().month(0).endOf('month').format("YYYY-MM-DD")
-           this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
-
+        this.modetype = 1
+         this.monthType = month;
+        this.getlist()
+         return false
       }
       //2月
       if(month == 1){
-         const fourQuarterStart = moment().month(1).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(1).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+         this.modetype = 1
+          this.monthType = month;
+        this.getlist()
+        return false
       }
       //
      //3月
       if(month == 2){
-         const fourQuarterStart = moment().month(2).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+       this.modetype = 1
+        this.monthType = month;
+       this.getlist()
+       return false
       }
       //4月
        if(month == 3){
-         const fourQuarterStart = moment().month(3).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(3).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+         this.modetype = 1
+          this.monthType = month;
+         this.getlist()
+         return false
       }
       //5月
        if(month == 4){
-         const fourQuarterStart = moment().month(4).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(4).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.modetype = 1
+         this.monthType = month;
+         this.getlist()
+         return false
       }
       //6月
        if(month == 5){
-         const fourQuarterStart = moment().month(5).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(5).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+         this.modetype = 1
+          this.monthType = month;
+        this.getlist()
+        return false
       }
       //7月
        if(month == 6){
-         const fourQuarterStart = moment().month(6).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(6).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+       this.modetype = 1
+        this.getlist()
+        return false
       }
       //8月
        if(month == 7){
-         const fourQuarterStart = moment().month(7).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(7).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+        this.getlist()
+        return false
       }
       //9月
        if(month == 8){
-         const fourQuarterStart = moment().month(8).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(8).endOf('month').format("YYYY-MM-DD")
-         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+        this.getlist()
+        return false
       }
       //10月
        if(month == 9){
-         const fourQuarterStart = moment().month(9).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(9).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+        this.getlist()
+        return false
       }
       //11月
        if(month == 10){
-         const fourQuarterStart = moment().month(10).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(10).endOf('month').format("YYYY-MM-DD")
-         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+        this.getlist()
+        return false
       }
        //12月
        if(month == 11){
-         const fourQuarterStart = moment().month(11).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+         this.getlist()
+         return false
       }
     },
     getNormData(){
       getNormData().then(response=>{
          if(response.data.state === 1){
            var normdata = response.data.data.normdata
-           console.log("normdata",normdata)
            this.normData = normdata
+           this.getlist()
          }
       })
     },
     //第一季度
-    getFirstQuarter(val,startime,endtime){
+    getlist(){
        this.modesData.series = []
        this.modesData.xAxis = []
-      getFirstQuarter(val,startime,endtime).then(response=>{
+         //本月的开始时间
+         //第一季度
+         if(this.modetype == 0 && this.quarterType == 0){
+            
+             this.startime =  moment().startOf('year').format('YYYY-MM-DD')
+             this.endtime = moment().month(2).endOf('month').format("YYYY-MM-DD")
+             
+         }
+         //第二季度
+         if(this.modetype ==0 && this.quarterType == 1){
+             this.startime = moment().month(3).startOf('month').format("YYYY-MM-DD")   
+             this.endtime = moment().month(5).endOf('month').format("YYYY-MM-DD")
+         }
+         //第三季度
+         if( this.modetype ==0 && this.quarterType == 2){
+           this.startime = moment().month(6).startOf('month').format("YYYY-MM-DD")
+           this.endtime = moment().month(8).endOf('month').format("YYYY-MM-DD")
+         }
+         //第四季度
+         if( this.modetype ==0 && this.quarterType == 3){
+             this.startime = moment().month(8).startOf('month').format("YYYY-MM-DD")
+             this.endtime = moment().month(11).endOf('month').format("YYYY-MM-DD")
+         }
+         
+         //1月
+         if(this.modetype == 1 && this.monthType == 0){
+          this.startime = moment().month(0).startOf('month').format("YYYY-MM-DD")
+          this.endtime = moment().month(0).endOf('month').format("YYYY-MM-DD")
+         
+         }
+         //2 月
+         if( this.modetype == 1 && this.monthType == 1){
+            this.startime = moment().month(1).startOf('month').format("YYYY-MM-DD")
+            this.endtime = moment().month(1).endOf('month').format("YYYY-MM-DD")
+         }
+          //3 月
+         if(this.modetype == 1 && this.monthType == 2){
+           this.startime = moment().month(2).startOf('month').format("YYYY-MM-DD") 
+           this.endtime = moment().month(2).endOf('month').format("YYYY-MM-DD")
+          
+         }
+          //4月
+         if(this.modetype == 1 && this.monthType == 3){
+           this.startime = moment().month(3).startOf('month').format("YYYY-MM-DD")
+           this.endtime = moment().month(3).endOf('month').format("YYYY-MM-DD")
+         }
+           //5月
+         if(this.modetype == 1 && this.monthType == 4){
+          this.startime = moment().month(4).startOf('month').format("YYYY-MM-DD")
+          this.endtime= moment().month(4).endOf('month').format("YYYY-MM-DD")
+          }
+            //6月
+         if(this.modetype == 1 && this.monthType == 5){
+           this.startime = moment().month(5).startOf('month').format("YYYY-MM-DD")
+          this.endtime = moment().month(5).endOf('month').format("YYYY-MM-DD")
+           
+         }
+            //7月
+         if(this.modetype == 1 && this.monthType == 6){
+          this.startime = moment().month(6).startOf('month').format("YYYY-MM-DD")
+          this.endtime = moment().month(6).endOf('month').format("YYYY-MM-DD")
+         }
+            //8月
+         if(this.modetype==1 && this.monthType == 7){
+            this.startime = moment().month(7).startOf('month').format("YYYY-MM-DD")
+            this.endtime = moment().month(7).endOf('month').format("YYYY-MM-DD")
+         }
+         //9月
+          if(this.modetype == 1 && this.monthType == 8){
+             this.startime = moment().month(8).startOf('month').format("YYYY-MM-DD")
+            this.endtime = moment().month(8).endOf('month').format("YYYY-MM-DD")
+            
+         }
+          //10月
+          if(this.modetype == 1 && this.monthType == 9){
+           this.startime = moment().month(9).startOf('month').format("YYYY-MM-DD")
+           this.endtime = moment().month(9).endOf('month').format("YYYY-MM-DD")
+            
+         }
+         //11月
+         if(this.modetype == 1 && this.monthType == 10){
+            this.startime = moment().month(10).startOf('month').format("YYYY-MM-DD")       
+            this.endtime = moment().month(10).endOf('month').format("YYYY-MM-DD")
+         }
+          //12月
+         if(this.modetype == 1 && this.monthType == 11){
+          
+           this.startime = moment().month(11).startOf('month').format("YYYY-MM-DD")
+           this.endtime = moment().month(11).endOf('month').format("YYYY-MM-DD")
+         }
+
+         if(this.modetype == 2){
+            this.startime = this.listQuery.start_time
+            this.endtime = this.listQuery.end_time
+         }
+        const params = {
+          lapseto:this.lapseto,
+          startime:this.startime,
+          endtime:this.endtime
+        }
+      getFirstQuarter(params).then(response=>{
          if(response.data.state === 1){
             var count =  response.data.data.count
-            console.log("count",count)
+            console.log("count",count)  
+            //获取已经配置的数据 
             var arr=[]
             for(let i=0;i<count.length;i++){  
                for(let j=0;j<this.normData.length;j++){
@@ -448,7 +578,8 @@ export default {
                 }
               }
             }
-            console.log("arr",arr)
+           console.log("arr",arr )
+           
             var arrtwo =  this.arrayDate(count,this.normData)
             for(let i=0;i<arrtwo.length;i++){
                 this.$set(arrtwo[i], 'Count', 0)
@@ -459,7 +590,7 @@ export default {
             arrtwo.map(item => {
               arr.push(item)
             })
-            arr.sort(this.compare('sort'))    
+            // arr.sort(this.compare('sort'))    
             for(const key in this.normData ){
                this.modesData.xAxis.push(this.normData[key].item_name);
                 if(key in arr){
@@ -470,7 +601,7 @@ export default {
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
-            console.log(2222,this.modesData)
+    
 
           
          }
@@ -503,19 +634,13 @@ export default {
                 result.push(obj);
             }
         }
-        console.log("result",result)
         return result;
     },
   },
   created(){
-       //本月的开始时间
-      const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
-    
-      const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-     
      //获取指标正常范围值
      this.getNormData()
-     this.getFirstQuarter(this.lapseto,firstQuarterStart,firstQuarterEnd)
+    // this.getFirstQuarter(this.lapseto,firstQuarterStart,firstQuarterEnd)
   }
 };
 </script>

src/xt_pages/qcd/outcomeIndicators/control.vue

@@ -204,7 +204,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "结果指标" },
         { path: false, name: "指标控制" }
       ],

src/xt_pages/qcd/patientAnalysis/bloodPressure.vue

@@ -159,7 +159,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'总量分析'},
       ],

src/xt_pages/qcd/patientAnalysis/complication.vue

@@ -142,7 +142,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'并发症分析'},
       ],

src/xt_pages/qcd/patientAnalysis/dialysisAge.vue

@@ -162,7 +162,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'透析龄分析'},
       ],

src/xt_pages/qcd/patientAnalysis/infectiousDiseases.vue

@@ -171,7 +171,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'并发症分析'},
       ],

src/xt_pages/qcd/patientAnalysis/lapseto.vue

@@ -156,7 +156,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'转归分析'},
       ],

src/xt_pages/qcd/patientAnalysis/person/bloodPressure.vue

@@ -125,7 +125,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'统计'},
         {path:false, name:'血压'},

src/xt_pages/qcd/patientAnalysis/person/lapseto.vue

@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'统计'},
         {path:false, name:'转归'},

src/xt_pages/qcd/patientAnalysis/person/oralMedicine.vue

@@ -162,7 +162,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'统计'},
         {path:false, name:'口服药'},

src/xt_pages/qcd/patientAnalysis/person/weight.vue

@@ -125,7 +125,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'统计'},
         {path:false, name:'体重'},

src/xt_pages/qcd/patientAnalysis/weight.vue

@@ -169,7 +169,7 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
+        {path:false, name:'质控管理'},
         {path:false, name:'患者分析'},
         {path:false, name:'体重分析'},
       ],

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -7,18 +7,22 @@
       <div class="page_patientComplianceDetails">
         <div class="cell clearfix" style="margin:0">
           <el-form :inline="true" :model="listQuery">
-            <el-form-item label>
-              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
-            </el-form-item>
           </el-form>
         </div>
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
-              <el-table-column prop="date" label="日期" width="70"></el-table-column>
-              <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+            <el-table :data="patientsData" border style="width: 100%;" height="500"  highlight-current-row @current-change="handleChange">
+              <el-table-column prop="name" label="透析号" width="80">
+                 <template slot-scope="scope">
+                    {{scope.row.dialysis_no}}
+                 </template>
+              </el-table-column>
+              <el-table-column prop="date" label="透析号" width="70">
+                 <template slot-scope="scope">
+                    {{scope.row.name }}
+                 </template>
+              </el-table-column>
             </el-table>
           </div>
           <div class="containerRight" style="flex:1;overflow: hidden">
@@ -50,6 +54,7 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
               ></el-date-picker>
               <span class>-</span>
               <el-date-picker
@@ -63,6 +68,7 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
               ></el-date-picker>
             </div>
             <div class="tableTitle">指标监控</div>
@@ -70,14 +76,14 @@
               <div class="qualityBox">
                 <div
                   class="qualityOne"
-                  v-for="(item,index) in arr"
+                  v-for="(item,index) in normData"
                   :key="index"
                   :class="quality == index ? 'active' : ''"
-                  @click="clickQuality(index)"
+                  @click="clickQuality(index,item.inspection_minor)"
                 >
-                  <p>{{ item }}</p>
-                  <i class="iconfont icon-gantanhao gth" v-if="index % 2 == 0"></i>
-                  <i class="iconfont icon-gou gou" v-else></i>
+                  <p>{{ item.item_name }}</p>
+                   <span v-if="isTrue == 1"><i class="iconfont icon-gou gou"></i></span>
+                   <span v-if="isTrue == 0"><i class="iconfont icon-gantanhao gth"></i></span>
                 </div>
               </div>
             </div>
@@ -93,10 +99,12 @@
 </template>
 
 <script>
+const moment = require('moment')
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../qcd/components/LineChart";
 import { uParseTime } from "@/utils/tools";
+import { getCurrentOrgPatients,GetQualityControl,getNormData,getPatientComplianceDetail } from "@/api/common/common"
 export default {
   components: {
     LineChart,
@@ -104,72 +112,39 @@ export default {
   },
   data() {
     return {
+     isTrue:0,
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "患者达标详情" }
       ],
-      tableData: [
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        },
-        {
-          date: "2016",
-          name: "王小虎"
-        }
-      ],
+      patientsData:[],
+      normData:[],
+      startime:0,
+      endtime:0,
       listQuery: {
         start_time: "",
         end_time: "",
         page: 1,
         limit: 10
       },
+      item_id:0,
       month: [
         { value: 0, label: "本月", state: 0 },
         { value: 1, label: "近三个月", state: 1 },
         { value: 2, label: "近半年", state: 2 },
         { value: 3, label: "近一年", state: 3 }
       ],
+     modesData: {
+        xAxis: [],
+        series: []
+      },
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      },
+      patientid:0,
       monthType: 0,
       arr: ["钙", "磷", "钙萨达撒所多", "磷", "钙", "磷", "钙", "磷"],
       quality: 0,
@@ -183,7 +158,7 @@ export default {
           left: 0
         },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -195,23 +170,13 @@ export default {
           {
             name: "次数",
             type: "line",
-            data: [
-              "78.57",
-              "50",
-              "80",
-              "93.33",
-              "92.86",
-              "100",
-              "12",
-              "77",
-              "37"
-            ],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}g/L"
               }
             },
             //配置样式
@@ -258,15 +223,74 @@ export default {
             }
           }
         ]
-      }
+      },
+      inspect_date:0,
+      monthActive:0,
     };
   },
   methods: {
     chooseMonth(month) {
+      //一月
+      if(month == 0){
+         this.monthActive = 0
+        const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        var now = new Date()
+        var nowMonth = now.getMonth(); //当前月
+        var nowYear = now.getFullYear(); //当前年
+        //本月的开始时间
+        var monthStartDate = new Date(nowYear, nowMonth, 1);
+        this.startime=Date.parse(monthStartDate)/1000;//s
+
+        //本月的结束时间
+        var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
+        this.endtime =Date.parse(monthEndDate)/1000-1;//s
+         this.getlistDetail()
+      }
+
+      //近三月
+      if(month == 1){
+         this.monthActive = 1
+        const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
+    
+        this.startime = Date.parse(startDate)/1000
+       
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+      
+        this.endtime = Date.parse(endDate)/1000
+    
+        this.getlistDetail()
+      }
+    
+
+       //近半年
+      if(month == 2){
+        this.monthActive = 2
+        const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
+        
+        this.startime = Date.parse(startDate)/1000
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        this.endtime = Date.parse(endDate)/1000
+        this.getlistDetail()
+      }
+
+      //近一年
+      if(month == 3){
+        this.monthActive = 3
+        const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
+        this.startime = Date.parse(startDate)/1000
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        this.endtime = Date.parse(endDate)/1000
+        this.getlistDetail()
+      }
+
+
       this.monthType = month;
     },
-    clickQuality(index) {
+    clickQuality(index,itemid) {
       this.quality = index;
+      this.item_id = itemid
+      this.getlistDetail()
     },
     handleSizeChange(limit) {
       //this.limit = limit;
@@ -279,6 +303,156 @@ export default {
     getTime(time) {
       return uParseTime(time, "{y}-{m}-{d}");
     },
+    onSearch(){
+    },
+    changeTime(val){
+       var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.start_time = "";
+      } else {
+         this.startime = Date.parse(val)/1000;//s
+        this.getlistDetail()
+      }
+
+    },
+    changeEndTime(val){
+      var time =
+          this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+        if (time < 0) {
+          this.$message.error("结束时间不能小于开始时间");
+          this.listQuery.end_time = "";
+        } else {
+          this.endtime = Date.parse(val)/1000;//s
+          this.getlistDetail()
+        }
+
+    },
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    handleChange(val){
+     this.patientid = val.id
+      this.getlistDetail()
+    },
+   getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+          if(response.data.state == 1){
+            var patients = response.data.data.patients
+            this.patientsData = patients
+          }
+      })
+    },
+    getNormData(){
+      getNormData().then(response=>{
+         var normdata = response.data.data.normdata
+          for(let i=0;i<normdata.length;i++){
+            this.item_id = normdata[0].inspection_minor
+          }
+          this.normData = normdata
+          this.getlist()
+      })
+    },
+    getlist(){
+        this.modesData.series = []
+        this.modesData.xAxis = []
+        const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        var now = new Date()
+        var nowMonth = now.getMonth(); //当前月
+        var nowYear = now.getFullYear(); //当前年
+        //本月的开始时间
+        var monthStartDate = new Date(nowYear, nowMonth, 1);
+        this.startime=Date.parse(monthStartDate)/1000;//s
+        //本月的结束时间
+         var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
+         this.endtime =Date.parse(monthEndDate)/1000-1;//s
+
+          const params = {
+            patientid:this.patientid,
+            startime:this.startime,
+            endtime:this.endtime,
+            itemid:this.item_id,
+            inspectdate:this.inspect_date,
+          }
+       GetQualityControl(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            for(let i=0;i<list.length;i++){
+              if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
+                    this.isTrue = 1  
+               }
+               if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
+                    this.isTrue =0
+               }
+              this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
+               this.modesData.series.push(list[i].inspect_value)
+            
+            }
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
+       
+          }
+
+       })
+    },
+
+    getlistDetail(){
+       this.modesData.series = []
+        this.modesData.xAxis = []
+        const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+
+       if(this.monthActive == 0){
+          var now = new Date()
+          var nowMonth = now.getMonth(); //当前月
+          var nowYear = now.getFullYear(); //当前年
+          //本月的开始时间
+          var monthStartDate = new Date(nowYear, nowMonth, 1);
+          this.startime=Date.parse(monthStartDate)/1000;//s
+          //本月的结束时间
+          var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
+          this.endtime =Date.parse(monthEndDate)/1000-1;//s
+        }
+     
+          const params = {
+            patientid:this.patientid,
+            startime:this.startime,
+            endtime:this.endtime,
+            itemid:this.item_id,
+          }
+        console.log("params",params)
+       getPatientComplianceDetail(params).then(response=>{
+            if(response.data.state == 1){
+              var list =  response.data.data.list
+              for(let i=0;i<list.length;i++){
+                if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
+                      this.isTrue = 1  
+                }
+                if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
+                      this.isTrue =0
+                }
+                this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
+                this.modesData.series.push(list[i].inspect_value)
+            
+            }
+              this.chart.series[0].data = this.modesData.series
+              this.chart.xAxis.data = this.modesData.xAxis
+            }
+       })
+    }
+  },
+
+   created(){
+     this.patientid =  this.$route.query.patientid
+     this.inspect_date = this.$route.query.date
+     //获取指标项
+      this.getNormData()
+     //获取该机构下的所有患者
+      this.getCurrentOrgPatients()
+
+
   }
 };
 </script>

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -8,8 +8,21 @@
         <div class="cell clearfix">
           <el-form :inline="true" :model="listQuery">
             <el-form-item label>
-              <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width: 200px;"></el-input>
-              <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+               <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model.trim="listQuery.search"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="输入病人透析号/姓名"
+                @select="handleSelect"
+              >
+                <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+              </el-autocomplete>
+
             </el-form-item>
           </el-form>
           <el-select v-model="lapstor" placeholder="请选择" style="margin-right:20px;width:100px">
@@ -77,12 +90,15 @@
               :key="index"
             >
             <template slot-scope="scope">
-              {{ scope.row.data[index].inspect_value}}
+                 <span v-if="scope.row.data[modeItem.item_name].inspect_value == ''">0</span>
+                 <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) < parseInt(scope.row.data[modeItem.item_name].range_min))">{{scope.row.data[modeItem.item_name].inspect_value}}↓</span>
+                <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) > parseInt(scope.row.data[modeItem.item_name].range_max))">{{scope.row.data[modeItem.item_name].inspect_value}}↑</span>
+                <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) >= parseInt(scope.row.data[modeItem.item_name].range_min))&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) <= parseInt(scope.row.data[modeItem.item_name].range_max)) ">{{scope.row.data[modeItem.item_name].inspect_value}}</span>
             </template>
         </el-table-column>
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
-                <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+                <el-button @click="handleClick(scope.row.patient_id,scope.row.inspect_date)" type="text" size="small">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -106,10 +122,11 @@
 </template>
 
 <script>
+import { PostSearch} from '@/api/patient'
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../qcd/components/LineChart";
-import { getNormData,getPatientsControl } from "@/api/common/common"
+import { getNormData,getPatientsControl,getCartogramlist,getPatientContorlAnalysis,getCurrentOrgPatients } from "@/api/common/common"
 export default {
   components: {
     LineChart,
@@ -124,14 +141,14 @@ export default {
         }
       },
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "患者质控达标统计" }
       ],
       listQuery: {
         start_time: "",
         end_time: "",
         page: 1,
-        limit: 10
+        limit: 20
       },
       total:0,
       lapstor:0,
@@ -150,6 +167,10 @@ export default {
         },
       ],
       value: "",
+      modesData: {
+        xAxis: [],
+        series: []
+      },
       chart: {
         title: {
           text: "ECharts 入门示例"
@@ -178,7 +199,17 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: (params) => {
+                  if(this.obj.length > 0){
+                      let str = ''
+                      str = '('+ this.obj[params.dataIndex] +'人'+',' + params.data +'%' +')'
+                    return str
+                  }else{
+                    let str = ''
+                    str = params.data+'%'
+                    return str
+                  }
+                }
               }
             },
             //配置样式
@@ -219,14 +250,25 @@ export default {
           }
         ]
       },
+      patientsArr:[],
       tableData: [],
       normData:[],
       paitents:[],
       tableName:[],
       total:0,
+       obj:[],
       ObjectData:{},
       tablePatients:[],
       tableSort:[],
+      dataName:[
+        {id:0,name:"达标"},
+        {id:1,name:"未达标"},
+      ],
+      dataCount:[
+         {id:0,count:0},
+         {id:1,count:0}
+      ],
+      patient_id:0,
     };
   },
   methods: {
@@ -256,14 +298,23 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+
       }
     },
-  getTimestamp(time) {
+    getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
-    handleClick(row) {
-      this.$router.push({ path: "/qcd/patientComplianceDetails" });
+    handleClick(patientid,inspectdate) {
+      // var id = 0
+      // var dialysis_no = 0
+      // for(let i=0;i<this.tablePatients.length;i++){
+      //    if(name == this.tablePatients[i].name){
+      //       id = this.tablePatients[i].patient_id
+      //       dialysis_no = this.tablePatients[i].dialysis_no
+      //    }
+      // }
+      this.$router.push({ path: "/qcd/patientComplianceDetails?patientid="+patientid+"&date="+inspectdate});
     },
     getDialysisNo(name){
         for(let i=0;i<this.tablePatients.length;i++){
@@ -276,7 +327,7 @@ export default {
       getNormData().then(response=>{
          if(response.data.state == 1){
            var normdata = response.data.data.normdata
-          // console.log("normdata",normdata)
+        //  console.log("normdata",normdata)
           this.normData = normdata
            var a=[];
            for(let i=0;i<normdata.length;i++){
@@ -285,8 +336,6 @@ export default {
           // console.log("a",a)
            this.newArr = a
            var arr = this.arrayToObj(a)
-
-         // console.log("娃哈哈",arr)
            this.ObjectData = arr
 
 
@@ -294,124 +343,252 @@ export default {
       })
     },
     onSearch(){
+         const params = {
+            lapstor:this.lapstor,
+            patientid:this.patient_id,
+            startime:this.listQuery.start_time,
+            endtime:this.listQuery.end_time,
+
+         }
+       getPatientContorlAnalysis(params).then(response=>{
+           if(response.data.state == 1){
+              var control = response.data.data.patientcontorDetail
+              console.log("control",control)
+              let dataInfo = {}
+              control.forEach((item, index) => {
+                let { inspect_date } = item
+                if (!dataInfo[inspect_date]) {
+                  dataInfo[inspect_date] = {
+                    inspect_date,
+                    name: item.name,
+                    child: [],
+                    patient_id: item.patient_id
+
+                  }
+                }
+              })
+              let list = Object.values(dataInfo)
+              console.log("list",list)
+              list.map(item => {
+                for (let i = 0; i < control.length; i++) {
+                  if (item.inspect_date == control[i].inspect_date && item.patient_id == control[i].patient_id) {
+                    item.child.push(control[i])
+                  }
+                }
+              })
+                var newarrtwo = []
+                list.map(item => {
+                  item.child.map(it => {
+                    newarrtwo.push(it)
+                  })
+                })
+
+                // 配置的才显示
+                var arrthree = []
+                for (let i = 0; i < newarrtwo.length; i++) {
+                  for (let j = 0; j < this.normData.length; j++) {
+                    if (newarrtwo[i].item_id == this.normData[j].inspection_minor) {
+                      arrthree.push(newarrtwo[i])
+                    }
+                  }
+                }
+                console.log("arrthree",arrthree)
+                var arrfour = this.arrayDate(arrthree, newarrtwo)
+                arrfour.map(item => {
+                  item.item_name = ''
+                  arrthree.push(item)
+                })
+
+                var dd = {}
+                for (const index in arrthree) {
+                  if (!(arrthree[index].inspect_date in dd)) {
+                    dd[arrthree[index].inspect_date] = {}
+                  }
+                  if (!(arrthree[index].item_name in dd[arrthree[index].inspect_date]) && arrthree[index].item_name != 0) {
+                    dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
+                  }
+                }
+
+                this.tableData = []
+
+                for (const key in dd) {
+                  for (const mkey in this.ObjectData) {
+                    if (!(this.ObjectData[mkey].item_name in dd[key])) {
+                      dd[key][this.ObjectData[mkey].item_name] = {
+                        item_name: this.ObjectData[mkey].item_name,
+                        name: mkey,
+                        inspect_value: 0
+                      }
+                    }
+                  }
+                  this.tableData.push({ name: key, data: dd[key]})
+                }
+              let dataInfotwo = {}
+              control.forEach((item, index) => {
+                let { inspect_date } = item
+                if (!dataInfotwo[inspect_date]) {
+                  dataInfotwo[inspect_date] = {
+                    inspect_date,
+                    name: item.name,
+                  }
+                }
+              })
+              let listtwo = Object.values(dataInfotwo)
+                listtwo.map(item=>{
+                  this.tableData.map(it=>{
+                    if(item.inspect_date == parseInt(it.name)){
+                      it.name = item.name
+                    }
+                  })
+                })
+                //   let projectArr = []
+                //   this.newArr.map(item => {
+                //     projectArr.push(item.item_name)
+                //   })
+
+                //   this.tableData.map(item => {
+                //     let newarr = Object.values(item.data)
+                //     newarr.sort((a, b) => {
+                //       return projectArr.indexOf(a.item_name) - projectArr.indexOf(b.item_name)
+                //     })
+                //     item.data = newarr
+                //   })
+
+                  // for (let i = 0; i < this.patientsArr.length; i++) {
+                  //   for (let j = 0; j < this.tableData.length; j++) {
+                  //     if (this.patientsArr[i].name == this.tableData[j].name) {
+                  //       this.tableData[j].dialysis_no = this.patientsArr[i].dialysis_no
+                  //       this.tableData[j].patient_id = this.patientsArr[i].id
+                  //     }
+                  //   }
+                  // }
+
+                }
+          })
     },
     getlist(){
       getPatientsControl(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state == 1){
            var patients = response.data.data.patients
-          // console.log("paitents",patients)
-          this.tablePatients = patients
-           var total =  response.data.data.total
-          // console.log("total",total)
-           this.total = total
-           var control = response.data.data.control
-         // console.log("control",control)
-          var newArr = []
-           //分页
-           for(let i=0;i<control.length;i++){
-             for(let j=0;j<patients.length;j++){
-                if(control[i].patient_id == patients[j].patient_id){
-                   newArr.push(control[i])
+            // console.log("patients",patients)
+            this.tablePatients = patients
+            var total = response.data.data.total
+            this.total = total
+            var control = response.data.data.control
+            // console.log("control",control)
+            var newArr = []
+            // 分页
+            for (let i = 0; i < control.length; i++) {
+              for (let j = 0; j < patients.length; j++) {
+                if (control[i].inspect_date == patients[j].inspect_date) {
+                  newArr.push(control[i])
                 }
-             }
-           }
-        // console.log("newArr",newArr)
+              }
+            }
+          // console.log("newArr",newArr)
           let dataInfo = {}
           newArr.forEach((item, index) => {
-            let { patient_id } = item
-            if (!dataInfo[patient_id]) {
-              dataInfo[patient_id] = {
-                patient_id,
-                name:item.name,
+            let { inspect_date } = item
+            if (!dataInfo[inspect_date]) {
+              dataInfo[inspect_date] = {
+                inspect_date,
+                name: item.name,
                 child: [],
-                inspect_date:item.inspect_date
-
+                patient_id: item.patient_id
               }
             }
           })
+        let list = Object.values(dataInfo)
 
-          let list = Object.values(dataInfo)
-          list.map(item => {
+
+         list.map(item => {
             for (let i = 0; i < newArr.length; i++) {
-               if (item.inspect_date == newArr[i].inspect_date && item.patient_id == newArr[i].patient_id) {
-                   item.child.push(newArr[i])
-                }
+              if (item.inspect_date == newArr[i].inspect_date) {
+                item.child.push(newArr[i])
               }
+            }
+          })
+        //  console.log("list",list)
+         var newarrtwo = []
+          list.map(item => {
+            item.child.map(it => {
+              newarrtwo.push(it)
             })
-          //console.log("list",list)
-
-          var  newarrtwo = []
-          list.map(item=>{
-              item.child.map(it=>{
-                 newarrtwo.push(it)
-              })
           })
-       // console.log("多少条",newarrtwo)
+        //  console.log("newarrtwo",newarrtwo)
+          // 配置的才显示
+         var arrthree = []
+          for (let i = 0; i < newarrtwo.length; i++) {
+            for (let j = 0; j < this.normData.length; j++) {
+              if (newarrtwo[i].item_id == this.normData[j].inspection_minor) {
+                arrthree.push(newarrtwo[i])
+              }
+            }
+          }
 
-        //配置的才显示
+          var arrfour = this.arrayDate(arrthree, newarrtwo)
+          arrfour.map(item => {
+            item.item_name = ''
+            arrthree.push(item)
+          })
+          // console.log('arrthree', arrthree)
+          var dd = {}
+           for (const index in arrthree) {
+             if (!(arrthree[index].inspect_date in dd)) {
+               dd[arrthree[index].inspect_date] = {}
+             }
+             if (!(arrthree[index].item_name in dd[arrthree[index].inspect_date]) && arrthree[index].item_name != 0) {
+               dd[arrthree[index].inspect_date][arrthree[index].item_name] = arrthree[index]
 
-        var arrthree = []
-        for(let i=0;i<newarrtwo.length;i++){
-           for(let j=0;j<this.normData.length;j++){
-              if(newarrtwo[i].item_id == this.normData[j].inspection_minor){
-                 arrthree.push(newarrtwo[i])
-              }
+             }
            }
-        }
-        // console.log("arrthree",arrthree)
 
-       var arrfour =  this.arrayDate(arrthree,newarrtwo)
-       // console.log("arrfour",arrfour)
-         arrfour.map(item=>{
-           item.item_name = ""
-           arrthree.push(item)
-         })
-
-          var dd = {};
-           for (const index in arrthree) {
-           if (!(arrthree[index].name in dd)) {
-              dd[arrthree[index].name] = {};
-            }
-             if (!(arrthree[index].item_name in dd[arrthree[index].name]) && arrthree[index].item_name != 0) {
-               dd[arrthree[index].name][arrthree[index].item_name] = arrthree[index];
+           let dataInfotwo = {}
+          newArr.forEach((item, index) => {
+            let { inspect_date } = item
+            if (!dataInfotwo[inspect_date]) {
+              dataInfotwo[inspect_date] = {
+                inspect_date,
+                name: item.name,
+                inspect_value:item.inspect_value,
+                id:item.id,
+                inspect_date:item.inspect_date
+              }
             }
-          }
-        console.log("ddd",dd)
-         console.log("obj",this.ObjectData)
-          this.tableData= []
-
-          for(const key in dd){
-              for(const mkey in this.ObjectData){
-                 if (!(this.ObjectData[mkey].item_name in dd[key])) {
-                   dd[key][this.ObjectData[mkey].item_name] = {
-                   item_name: this.ObjectData[mkey].item_name,
-                   name: mkey,
-                   inspect_value:0
-                  };
+          })
+        let listtwo = Object.values(dataInfotwo)
+        console.log("listtwo",listtwo)
+          for (const key in dd) {
+            for (const mkey in this.ObjectData) {
+              if (!(this.ObjectData[mkey].item_name in dd[key])) {
+                dd[key][this.ObjectData[mkey].item_name] = {
+                  item_name: this.ObjectData[mkey].item_name,
+                  name: mkey,
+                  inspect_value: 0
                 }
               }
-              this.tableData.push({ name: key, data: dd[key]});
-             }
+            }
+            this.tableData.push({ name: key, data: dd[key]})
+          }
 
-           
-            let projectArr = []
-            this.newArr.map(item => {
-              projectArr.push(item.item_name)
-            })
-            console.log("projectArr",projectArr)
-
-            this.tableData.map(item => {
-            // console.log("item---",item.data)
-              let newarr = Object.values(item.data);
-              // console.log("arr",newarr)
-              newarr.sort((a,b)=>{
-                // console.log(1111,a)
-                // console.log(2222,b)
-                return projectArr.indexOf(a.item_name)-projectArr.indexOf(b.item_name);
-              });
-              item.data = newarr
+          listtwo.map(item=>{
+            this.tableData.map(it=>{
+              if(item.inspect_date == parseInt(it.name)){
+                 it.name = item.name
+                 it.id = item.id
+                 it.inspect_date = item.inspect_date
+              }
             })
-              console.log("表",this.tableData)
+          })
+          for(let i=0;i<this.patientsArr.length;i++){
+             for(let j=0;j<this.tableData.length;j++){
+               if(this.patientsArr[i].name == this.tableData[j].name){
+                   this.tableData[j].dialysis_no = this.patientsArr[i].dialysis_no
+                   this.tableData[j].patient_id = this.patientsArr[i].id
+               }
+             }
+          }
+         console.log("表哥123",this.tableData)
          }
       })
     },
@@ -425,11 +602,11 @@ export default {
         var result = [];
         for(var i = 0; i < array2.length; i++){
             var obj = array2[i];
-            var num = obj.patient_id;   //staff_id   就是要对比的key
+            var num = obj.item_id;   //staff_id   就是要对比的key
             var isExist = false;
             for(var j = 0; j < array1.length; j++){
                 var aj = array1[j];
-                var n = aj.patient_id;
+                var n = aj.item_id;
                 if(n == num){
                     isExist = true;
                     break;
@@ -439,9 +616,121 @@ export default {
                 result.push(obj);
             }
         }
-        console.log("result",result)
         return result;
     },
+
+    getCartogramlist(){
+       getCartogramlist(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
+           if(response.data.state == 1){
+              var cartogramlist =  response.data.data.cartogramlist
+            //  console.log("cartogramlist",cartogramlist)
+              var totaltwo =  response.data.data.total
+              // console.log("totaltwo",totaltwo)
+               var cart = []
+               for(let i=0;i<cartogramlist.length;i++){
+                  if(cartogramlist[i].inspect_value != ''){
+                    cart.push(cartogramlist[i])
+                  }
+               }
+              // console.log("cart",cart)
+               let dataInfo = {}
+                cart.forEach((item, index) => {
+                  let { inspect_date } = item
+                  if (!dataInfo[inspect_date]) {
+                    dataInfo[inspect_date] = {
+                      inspect_date,
+                      name:item.name,
+                      child: [],
+                      patient_id:item.patient_id,
+                      total:0,
+                      count:0,
+                    }
+                  }
+                })
+              let list = Object.values(dataInfo)
+              console.log("list",list)
+
+              var arr = []
+              list.map(item=>{
+                 for(let i=0;i<cart.length;i++){
+                    if(item.inspect_date == cart[i].inspect_date && item.patient_id == cart[i].patient_id){
+                        item.child.push(cart[i])
+                    }
+                 }
+              })
+
+
+
+             list.map(item=>{
+                item.child.map(it=>{
+                   if(parseInt(it.range_min)<=parseInt(it.inspect_value) && parseInt(it.inspect_value)<=parseInt(it.range_max)){
+                       item.total ++
+                   }
+                })
+             })
+             var standardTotal = 0
+
+             list.map(item=>{
+               if(item.total == item.child.length){
+                  item.count ++
+               }
+             })
+             list.map(item=>{
+               standardTotal += item.count
+             })
+             var totalCount = list.length
+            //  console.log("arr",list)
+            //  console.log("合格",standardTotal)
+            //  console.log("总人数",totalCount)
+             for(let i=0;i<this.dataCount.length;i++){
+                this.dataCount[0].count = standardTotal
+                this.dataCount[1].count =  totalCount - standardTotal
+               this.obj.push(this.dataCount[i].count)
+             }
+            // console.log("dataCount",this.dataCount)
+         for (let i = 0; i < this.dataName.length; i++) {
+            this.modesData.xAxis.push(this.dataName[i].name)
+
+          }
+          for (let i = 0; i < this.dataCount.length; i++) {
+              this.modesData.series.push(((this.dataCount[i].count / totalCount) * 100).toFixed(1))
+            }
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
+            //  console.log("this",this.modesData)
+           }
+       })
+    },
+     getCurrentOrgPatients(){
+       getCurrentOrgPatients().then(response=>{
+          if(response.data.state == 1){
+            this.patientsArr =  response.data.data.patients
+            // console.log("病人",this.patientsArr)
+            //获取列表数据
+            this.getlist()
+          }
+       })
+     },
+    querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.patient
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+   handleSelect(val) {
+        this.listQuery.search = val.name
+        this.patient_id = val.id
+        this.onSearch()
+     },
   },
   created(){
     var nowDate = new Date();
@@ -465,10 +754,15 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
+
+
+    this.getCurrentOrgPatients()
     //获取系统指标
     this.getNormData()
-    //获取列表数据
-    this.getlist()
+    //获取统计图数据
+    this.getCartogramlist()
+
+
   }
 };
 </script>

src/xt_pages/qcd/processIndicators.vue

@@ -179,7 +179,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: "/qcd/processindicators", name: "过程指标" }
       ],
       total: 0,

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -74,11 +74,21 @@
                 </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="指控范围" :label-width="formLabelWidth" required prop="large_range">
+
+          <!-- <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
             <el-input style="width:200px" v-model="form.min_range"></el-input>&nbsp;
             -
             <el-input style="width:200px" v-model="form.large_range"></el-input>
-          </el-form-item>
+          </el-form-item> -->
+          <div style="display:flex;">
+            <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="min_range">
+                <el-input style="width:200px" v-model="form.min_range"></el-input>
+            </el-form-item>
+            <span style="margin-top:10px">-</span>
+            <el-form-item class='newFormItem' :label-width="formLabelWidth" required prop="large_range">
+                <el-input style="width:200px" v-model="form.large_range"></el-input>
+            </el-form-item>
+          </div>
           <el-form-item label="排序" :label-width="formLabelWidth">
             <el-input style="width:200px" v-model="form.sort"></el-input>
           </el-form-item>
@@ -115,11 +125,20 @@
                 </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="指控范围" :label-width="formLabelWidth" required prop="large_range">
+          <!-- <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
             <el-input style="width:200px" v-model="editform.min_range"></el-input>&nbsp;
             -
             <el-input style="width:200px" v-model="editform.large_range"></el-input>
-          </el-form-item>
+          </el-form-item> -->
+           <div style="display:flex;">
+            <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="min_range">
+                <el-input style="width:200px" v-model="editform.min_range"></el-input>
+            </el-form-item>
+            <span style="margin-top:10px">-</span>
+            <el-form-item class='newFormItem' :label-width="formLabelWidth" required prop="large_range">
+                <el-input style="width:200px" v-model="editform.large_range"></el-input>
+            </el-form-item>
+          </div>
           <el-form-item label="排序" :label-width="formLabelWidth">
             <el-input style="width:200px" v-model="editform.sort"></el-input>
           </el-form-item>
@@ -146,7 +165,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "统计配置" },
         { path: false, name: "质控达标统计配置" }
       ],
@@ -176,7 +195,8 @@ export default {
       rules: {
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
-        large_range:[{required:true,message:"指控范围不能为空"}]
+        large_range:[{required:true,message:"质控范围不能为空"}],
+        min_range:[{required:true,message:"质控范围不能为空"}]
       },
       page:1,
       limit:10,
@@ -196,7 +216,7 @@ export default {
       getConfigurationDetail(id).then(response=>{
          if(response.data.state == 1){
            var configurationdetail = response.data.data.configurationdetail
-          // console.log("详情",configurationdetail)
+          console.log("详情",configurationdetail)
            this.editform.id = configurationdetail.id
            this.editform.inspectionMajor = configurationdetail.inspection_major
            this.editform.inspectionMinor = configurationdetail.inspection_minor
@@ -216,7 +236,7 @@ export default {
       getInspectionMajor().then(response=>{
         if(response.data.state == 1){
           var inspection =  response.data.data.inspection
-          //console.log("大项",inspection)
+          console.log("大项",inspection)
           this.InspectionMajor = inspection
          
         }
@@ -227,13 +247,14 @@ export default {
       getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-        // console.log("小项",inspection)
+         console.log("小项",inspection)
          this.InspectionMinor = inspection
         }
       })
     },
     changeInspectionTwo(id){
       this.InspectionMinorTwo = []
+      this.editform.inspectionMinor = ""
        getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
@@ -242,12 +263,12 @@ export default {
         }
       })
     },
-    // 获取指控范围
+    // 获取质控范围
     changeInspectionMonior(id){
        getInspectionRange(id).then(response=>{
          if(response.data.state == 1){
            var inspectionRange =  response.data.data.inspectionRange
-          // console.log("inspectionRange",inspectionRange)
+          console.log("inspectionRange",inspectionRange)
            this.form.min_range = inspectionRange.range_min
            this.form.large_range = inspectionRange.range_max
          }
@@ -293,7 +314,7 @@ export default {
               configurationlist[i].sort = ""
             }
           }
-          //console.log("列表",configurationlist)
+          console.log("列表",configurationlist)
           this.configuraData = configurationlist
           var total = response.data.data.total
          // console.log("total",total)
@@ -320,16 +341,20 @@ export default {
         var sort = parseInt(sorts)
         this.editform.sort = sort
        }
-     
-      UpdateConfiguration(this.editform.id,this.editform).then(response=>{
-        if(response.data.state == 1){
-         var standard =  response.data.data.standard
-        // console.log("standard",standard)
-         this.$message.success("保存成功")
-         this.editDialog = false
-         this.getConfigurationList()
-        }else{
-         this.$message.error("检查小项已存在")
+      this.$refs[formName].validate(valid=>{
+        if(valid){
+         UpdateConfiguration(this.editform.id,this.editform).then(response=>{
+            if(response.data.state == 1){
+            var standard =  response.data.data.standard
+            // console.log("standard",standard)
+            this.$message.success("保存成功")
+            this.editDialog = false
+            this.getConfigurationList()
+            this.getAllInspectionMinor()
+            }else{
+            this.$message.error("检查小项已存在")
+            }
+          })
         }
       })
     },
@@ -390,6 +415,11 @@ export default {
     text-align: center;
   }
 }
+.newFormItem{
+  .el-form-item__content{
+    margin-left:0 !important;
+  }
+}
 </style>
 
  <style rel="stylesheet/scss" lang="scss" scoped>

src/xt_pages/qcd/treatmentControlAnalysis.vue

@@ -18,7 +18,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "患者质控达标统计" }
       ]
     };

src/xt_pages/qcd/treatmentControlAnalysis/check.vue

@@ -10,9 +10,6 @@
           <el-tab-pane label="患者检验检查统计" name="second"></el-tab-pane>
         </el-tabs>
         <div class="cell clearfix">
-          <label class="title">
-            <span class="name">转归状态</span> :
-          </label>
           <div class="time">
             <ul class>
               <li
@@ -50,7 +47,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "治疗信息统计" },
         { path: false, name: "患者透析次数统计" }
       ],

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

@@ -3,8 +3,22 @@
     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-          <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
+          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+           <el-autocomplete
+             class="checkSearch"
+             popper-class="my-autocomplete"
+             v-model.trim="listQuery.search"
+             :fetch-suggestions="querySearchAsync"
+             :trigger-on-focus="false"
+             placeholder="输入病人透析号/姓名"
+             @select="handleSelect"
+              >
+             <i class="el-icon-search el-input__icon" slot="suffix"></i>
+               <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+              </template>
+          </el-autocomplete>
         </el-form-item>
       </el-form>
       <label class="title">
@@ -90,6 +104,7 @@
 
 
 <script>
+  import { PostSearch} from '@/api/patient'
   import {getCurrentOrgPatients,getAllMajorInspection,getPatientList,getPatientDetailCheck,SearchDetailCheck } from "@/api/common/common"
 export default {
   data() {
@@ -106,6 +121,8 @@ export default {
       total:0,
       tableName:[],
       ObjectData:{},
+      patient_id:0,
+      patient_name:"",
     };
   },
   methods: {
@@ -122,10 +139,11 @@ export default {
       }
     },
     onSearch(){
-      SearchDetailCheck(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+     getPatientDetailCheck(this.patient_id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
-           var  checkDetail =  response.data.data.checkDetail
-             var arr = []
+            var checkDetail =  response.data.data.checkDetail
+        
+            var arr = []
             for(let i=0;i<checkDetail.length;i++){
               for(let j=0;j<this.tableName.length;j++){
                  if(checkDetail[i].ProjectId == this.tableName[j].inspection_major){
@@ -133,22 +151,23 @@ export default {
                  }
               }
             }
-            // let projectArr = []
-            // this.newArr.map(item => {
-            //   projectArr.push(item.project_name)
-            // })
-            // console.log("projectArr",projectArr)
-            // projectArr.forEach((item,index) => {
-            //   if(!(arr[index] && item == arr[index].ProjectName)){
-            //     arr.splice(index,0,{Count:0, ProjectName: item,name: val.name})
-            //   }
-            // })
-            // this.tableData = []
-            // let obj = {}
-            // obj.name = val.name
-            // obj.data = arr
-            // this.tableData.push(obj)
-            console.log("arr",arr)
+
+            let projectArr = []
+            this.newArr.map(item => {
+              projectArr.push(item.project_name)
+            })
+            projectArr.forEach((item,index) => {
+              if(!(arr[index] && item == arr[index].ProjectName)){
+                arr.splice(index,0,{Count:0, ProjectName: item,name: this.listQuery.search})
+              }
+            })
+            this.tableData = []
+            let obj = {}
+            obj.name = this.listQuery.search
+            obj.data = arr
+            this.tableData.push(obj)
+            this.total = 1
+           
           }
       })
     },
@@ -184,16 +203,16 @@ export default {
       getAllMajorInspection().then(response=>{
         if(response.data.state === 1){
            var inspection = response.data.data.inspection
-           console.log("inspection",inspection)
+        
            var a=[];
            for(let i=0;i<inspection.length;i++){
              a.push(inspection[i])
            }
-           console.log("a",a)
+
            this.newArr = a
            var arr = this.arrayToObj(a)
            
-           console.log("arr",arr)
+      
            this.ObjectData = arr
            this.tableName = inspection
         }
@@ -203,13 +222,13 @@ export default {
       getPatientList(this.listQuery.start_time,this.listQuery.end_time,this.listQuery.limit,this.listQuery.page).then(response=>{
          if(response.data.state === 1){
            var patientInfo = response.data.data.patientInfo
-           console.log("列表数据2",patientInfo)
+          
 
            var total = response.data.data.total
-           console.log("total",total)
+        
            this.total = total
           var list = response.data.data.list
-          console.log("list",list)
+       
           var dtd = []
           for(let i=0;i<list.length;i++){
               for(let j=0;j<this.tableName.length;j++){
@@ -218,7 +237,7 @@ export default {
                   }
               }
           }
-          console.log("dtd",dtd)
+   
           var dd = {};
            for (const index in dtd) {
             if (!(dtd[index].name in dd)) {
@@ -228,8 +247,7 @@ export default {
               dd[dtd[index].name][dtd[index].ProjectName] = dtd[index];
             }
           }
-          console.log("ddd",dd)
-           console.log("this.ObjectData",this.ObjectData)
+       
            
             for(const key in dd){
               for(const mkey in this.ObjectData){
@@ -243,16 +261,16 @@ export default {
               }
               this.tableData.push({ name: key, data: dd[key]});
             }
-            console.log("表",this.tableData)
+       
             let projectArr = []
           
             this.newArr.map(item => {
               projectArr.push(item.project_name)
             })
-            console.log("projectArr",projectArr)
+      
             this.tableData.map(item => {
               let arr = Object.values(item.data);
-             console.log("arr",arr)
+       
               arr.sort((a,b)=>{
                 return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);
               });
@@ -265,7 +283,7 @@ export default {
       getPatientDetailCheck(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var checkDetail =  response.data.data.checkDetail
-            console.log("checkDetail",checkDetail)
+        
             var arr = []
             for(let i=0;i<checkDetail.length;i++){
               for(let j=0;j<this.tableName.length;j++){
@@ -274,11 +292,11 @@ export default {
                  }
               }
             }
+
             let projectArr = []
             this.newArr.map(item => {
               projectArr.push(item.project_name)
             })
-            console.log("projectArr",projectArr)
             projectArr.forEach((item,index) => {
               if(!(arr[index] && item == arr[index].ProjectName)){
                 arr.splice(index,0,{Count:0, ProjectName: item,name: val.name})
@@ -290,13 +308,34 @@ export default {
             obj.data = arr
             this.tableData.push(obj)
             this.total = 1
-            console.log("arr",this.tableData)
+           
           }
       })
     },
    arrayToObj(arr){
       return Object.assign({},arr);
-    }
+    },
+  querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.patient
+             console.log("searchArray",searchArray)
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+   handleSelect(val) {
+        this.listQuery.search = val.name
+        this.patient_id = val.id
+        this.onSearch()
+      },
   },
   created(){
      var nowDate = new Date();

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

@@ -3,8 +3,22 @@
     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-          <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
+          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+          <el-autocomplete
+             class="checkSearch"
+             popper-class="my-autocomplete"
+             v-model.trim="listQuery.search"
+             :fetch-suggestions="querySearchAsync"
+             :trigger-on-focus="false"
+             placeholder="输入病人透析号/姓名"
+             @select="handleSelect"
+              >
+             <i class="el-icon-search el-input__icon" slot="suffix"></i>
+               <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+              </template>
+          </el-autocomplete>
         </el-form-item>
       </el-form>
       <label class="title">
@@ -67,6 +81,7 @@
 
 
 <script>
+import { PostSearch} from '@/api/patient'
 import echarts from "echarts";
 import LineChart from "../../components/LineChart";
 import { getCurrentOrgPatients,getInspectionTotalCount,getInspectionDetailById,getSearchPatientInfo } from "@/api/common/common";
@@ -178,7 +193,8 @@ export default {
         xAxis: [],
         series: []
       },
-      obj:[]
+      obj:[],
+      patient_id:0,
     };
   },
   methods: {
@@ -216,11 +232,11 @@ export default {
       getInspectionTotalCount(this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var Inspection = response.data.data.Inspection
-            console.log("Inspection",Inspection)
+     
             this.tableData = Inspection
           
             var counts = response.data.data.counts
-            console.log("counts",counts)
+         
             var arr = []
             for(let i=0;i<Inspection.length;i++){
                for(let j=0;j<counts.length;j++){
@@ -229,9 +245,9 @@ export default {
                  }
                }
             }
-             console.log("arr",arr)
-             var arrtwo =  this.arrayDate(counts,this.normData)
-             console.log("arrtwo",arrtwo)
+          
+           var arrtwo =  this.arrayDate(counts,this.normData)
+            
             var hash = {};
             var i = 0;
             var res = [];
@@ -248,7 +264,7 @@ export default {
             res.map(item => {
              item.Count = eval(item.Count.join('+'))
             })
-            console.log(11111,res)
+           
             let arr1 = []
             this.tableData.map(it => {
               arr1.push(it.project_name)
@@ -262,24 +278,16 @@ export default {
             res.map(item => {
               this.modesData.series.push(parseInt(item.Count));
             })
-
-
+             console.log("this=====",this.tableData)
             for (const key in this.tableData) {
               this.modesData.xAxis.push(this.tableData[key].project_name);
-              // if (key in res) {
-                
-              //   this.modesData.series.push(parseInt(res[key].Count));
-              //   // batotal += parseInt(res[key].Count);
-              // } else {
-              //   this.modesData.series.push(0);
-              // }
+               let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
+               let day = parseInt(time / (1000 * 60 * 60 * 24))
+              this.obj.push(Math.round(day / this.tableData[key].inspection_frequency))
             }
-
-
             
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
-            console.log(2222,this.modesData)
           }
       })
     },
@@ -300,10 +308,11 @@ export default {
                  }
               }
             }
-            console.log("arr",arr)
+            
            let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
            let day = parseInt(time / (1000 * 60 * 60 * 24))
-           console.log("time",parseInt(time / (1000 * 60 * 60 * 24)))
+           console.log("arr",arr)
+           console.log("tabledata",this.tableData)
             for (const key in this.tableData) {
               this.modesData.xAxis.push(this.tableData[key].project_name);
               if (key in arr) {
@@ -323,10 +332,12 @@ export default {
 
     //搜索功能
     onSearch(){
-      getSearchPatientInfo(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+       this.modesData.series = []
+       this.modesData.xAxis = []
+      getSearchPatientInfo(this.patient_id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
          if(response.data.state  === 1){
            var PatientsInfo = response.data.data.PatientsInfo
-           console.log("PatientsInfo",PatientsInfo)
+           console.log("patientsInfo",PatientsInfo)
            var arr = []
            for(let i=0;i<this.tableData.length;i++){
              for(let j=0;j<PatientsInfo.length;j++){
@@ -335,7 +346,22 @@ export default {
                  }
              }
            }
-           console.log("arr",arr)
+           let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
+           let day = parseInt(time / (1000 * 60 * 60 * 24))
+       
+            for (const key in this.tableData) {
+              this.modesData.xAxis.push(this.tableData[key].project_name);
+              if (key in arr) {
+                this.modesData.series.push(parseInt(arr[key].Count));
+                this.obj.push(Math.round(day / arr[key].InspectionFrequency))
+                // batotal += parseInt(res[key].Count);
+              } else {
+                this.modesData.series.push(0);
+                this.obj.push(0)
+              }
+            }
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
          }
       })
     },
@@ -359,9 +385,30 @@ export default {
                 result.push(obj);
             }
         }
-        console.log("result",result)
         return result;
     },
+     querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.patient
+             console.log("searchArray",searchArray)
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+   handleSelect(val) {
+        console.log("val",val)
+        this.listQuery.search = val.name
+        this.patient_id = val.id
+        this.onSearch()
+      },
   },
   created(){
     var nowDate = new Date();

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

@@ -101,7 +101,7 @@
 <script>
 import echarts from "echarts";
 import LineChart from "../../components/LineChart";
-import {geStatistics} from "@/api/common/common"
+import {geStatistics,getTreatlist} from "@/api/common/common"
 export default {
   components: {
     LineChart
@@ -247,20 +247,76 @@ export default {
       this.geStatistics();
     },
     handleCurrentChange(page) {
+      this.tableData = []
       this.listQuery.page = page;
       this.geStatistics();
     },
    selectChange(val){
+     this.tableData=[]
      this.listQuery.value =val
      this.geStatistics()
+     this.getlist()
    },
-    geStatistics(){
+   getlist(){
       this.modesData.series = []
       this.modesData.xAxis = []
+     getTreatlist(this.listQuery).then(response=>{
+        if(response.data.state == 1){
+          var ttd =  response.data.data.list
+            var modeMap = {};
+            var batotal = 0;
+            for (const index in ttd) {
+              if (ttd[index].mode_id == "0") {
+                continue;
+              }
+              modeMap[ttd[index].mode_id] = ttd[index];
+            }
+            for (const key in this.modeOptions) {
+              this.modesData.xAxis.push(this.modeOptions[key].name);
+              if (key in modeMap) {
+                this.modesData.series.push(parseInt(modeMap[key].number));
+                batotal += parseInt(modeMap[key].number);
+              } else {
+                this.modesData.series.push(0);
+              }
+            }
+
+          this.chart.series[0].data = this.modesData.series
+          this.chart.xAxis.data = this.modesData.xAxis
+         }
+     })
+   },
+    geStatistics(){
       geStatistics(this.listQuery).then(response=>{
         if(response.data.state === 1){
-          var dtd =  response.data.data.statistics
-        //  console.log("dtd",dtd)
+          var statistics =  response.data.data.statistics
+          var treatinfo = response.data.data.treatinfo
+          this.total =  response.data.data.total
+          let dataInfo = {}
+           treatinfo.forEach((item, index) => {
+             let { date } = item
+             if (!dataInfo[date]) {
+                dataInfo[date] = {
+                   date,
+                   child: [],
+                 }
+                }
+            })
+         let list = Object.values(dataInfo)
+      
+         list.map(item=>{
+           for(let i=0;i<statistics.length;i++){
+             if(item.date == statistics[i].date){
+                item.child.push(statistics[i])
+             }
+           }
+         })
+         var dtd = []
+         list.map(item=>{
+           item.child.map(it=>{
+              dtd.push(it)
+           })
+         })
           var dd = {};
           for (const index in dtd) {
             if (!(dtd[index].date in dd)) {
@@ -270,11 +326,13 @@ export default {
               dd[dtd[index].date][dtd[index].mode_id] = dtd[index];
             }
           }
-          console.log("ddd",dd)
+          console.log("dd",dd)
           for (const key in dd) {
             var total = 0;
             for (const mkey in this.modeOptions) {
               if (mkey in dd[key]) {
+                console.log("=====",mkey)
+                console.log(this.modeOptions[mkey].name)
                 dd[key][mkey].mode = this.modeOptions[mkey].name;
                 var number = parseInt(dd[key][mkey].number);
                 if (isNaN(number) || number == 0) {
@@ -292,44 +350,13 @@ export default {
             }
             this.tableData.push({ date: key, data: dd[key], total: total });
           }
-          console.log("tabledata",this.tableData)
-          var ttd = response.data.data.ttd
-         // console.log("ttd",ttd)
-          var modeMap = {};
-          var batotal = 0;
-          for (const index in ttd) {
-            if (ttd[index].mode_id == "0") {
-              continue;
-            }
-            modeMap[ttd[index].mode_id] = ttd[index];
-          }
-         // console.log(111,modeMap)
-          for (const key in this.modeOptions) {
-            this.modesData.xAxis.push(this.modeOptions[key].name);
-            if (key in modeMap) {
-              this.modesData.series.push(parseInt(modeMap[key].number));
-              batotal += parseInt(modeMap[key].number);
-            } else {
-              this.modesData.series.push(0);
-            }
-          }
-
-          this.chart.series[0].data = this.modesData.series
-          this.chart.xAxis.data = this.modesData.xAxis
-         // console.log(this.chart.series[0].data)
-         // console.log(this.chart.xAxis.data)
-
-          this.total =  response.data.data.total
-         // console.log("total",this.total)
-
         }
-      })
+       })
     },
  
   },
   created(){
     this.modeOptions = this.$store.getters.treatment_mode;
-    console.log("-----",this.modeOptions)
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -350,9 +377,10 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+      //获取柱状图数据
+      this.getlist()
       //获取统计列表数据
       this.geStatistics()
-      console.log("activeModes",this.activeModes)
   },
   computed: {
     activeModes: function() {

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

@@ -3,8 +3,22 @@
     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-          <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
+          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
+           <el-autocomplete
+             class="checkSearch"
+             popper-class="my-autocomplete"
+             v-model.trim="listQuery.search"
+             :fetch-suggestions="querySearchAsync"
+             :trigger-on-focus="false"
+             placeholder="输入病人透析号/姓名"
+             @select="handleSelect"
+              >
+             <i class="el-icon-search el-input__icon" slot="suffix"></i>
+               <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+              </template>
+          </el-autocomplete>
         </el-form-item>
       </el-form>
       <label class="title">
@@ -98,6 +112,7 @@
 
 
 <script>
+ import { PostSearch} from '@/api/patient'
  import { getCurrentOrgPatients,getDialysisList,getDialysisDetailById,getPrescriptionByName } from "@/api/common/common";
  import { uParseTime } from "@/utils/tools";
 export default {
@@ -124,6 +139,7 @@ export default {
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
       }, 
+      patient_id:0,
     };
   },
   methods: {
@@ -173,97 +189,14 @@ export default {
     getDialysisList(){
       getDialysisList(this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state === 1){
-          //  var  dialysislist =  response.data.data.dialysislist
-          //  for(let i=0;i<dialysislist.length;i++){
-          //     if(dialysislist[i].mode_id == 1){
-          //       dialysislist[i].mode_id = "HD"
-          //     }
-          //      if(dialysislist[i].mode_id == 2){
-          //       dialysislist[i].mode_id = "HDF"
-          //     }
-          //      if(dialysislist[i].mode_id == 3){
-          //       dialysislist[i].mode_id = "HD+HP"
-          //     }
-          //      if(dialysislist[i].mode_id == 4){
-          //       dialysislist[i].mode_id = "HP"
-          //     }
-          //      if(dialysislist[i].mode_id == 5){
-          //       dialysislist[i].mode_id = "HF"
-          //     }
-          //      if(dialysislist[i].mode_id == 6){
-          //       dialysislist[i].mode_id = "SCUF"
-          //     }
-          //      if(dialysislist[i].mode_id == 7){
-          //       dialysislist[i].mode_id = "IUF"
-          //     }
-          //      if(dialysislist[i].mode_id == 8){
-          //       dialysislist[i].mode_id = "HFHD"
-          //     }
-          //      if(dialysislist[i].mode_id == 9){
-          //       dialysislist[i].mode_id = "HFHD+HP"
-          //     }
-          //      if(dialysislist[i].mode_id == 10){
-          //       dialysislist[i].mode_id = "PHF"
-          //     }
-          //      if(dialysislist[i].mode_id == 11){
-          //       dialysislist[i].mode_id = "HFR"
-          //     }
-          //     if(dialysislist[i].mode_id == 12){
-          //       dialysislist[i].mode_id = "HDF+HP"
-          //     }
-          //     if(dialysislist[i].mode_id == 13){
-          //       dialysislist[i].mode_id = "CRRT"
-          //     }
-          //    if(dialysislist[i].mode_id == 14){
-          //       dialysislist[i].mode_id = "腹水回输"
-          //     }
-          //     if(dialysislist[i].mode_id == 19){
-          //       dialysislist[i].mode_id = "IUF+HD"
-          //     }
-          //  }
-          //  console.log("dialysislist",dialysislist)
-          //  var hash = {};
-          //  var i = 0;
-          //  var res = [];
-          //  dialysislist.forEach(function(item) {
-          //   var patient_id = item.patient_id;
-          //   hash[patient_id] ? res[hash[patient_id] - 1].mode_id.push(item.mode_id) : hash[patient_id] = ++i && res.push({
-          //       mode_id: [item.mode_id],
-          //       patient_id: patient_id,
-          //       dialysis_no: item.dialysis_no,
-          //       name:item.name,
-          //       age:item.id_card_no,
-          //       total_dialysis:item.total_dialysis,
-          //       user_sys_before_count:item.user_sys_before_count,
-          //   })
-          //  });
-          //  res.map(item => {
-          //    item.age = this.getAge(item.age)
-          //  })
-          //  console.log(res)
-          //  //this.DialysisData = res
- 
-          //   var total = response.data.data.total
-          //   console.log("total",total) 
-          //  // this.total = total
-
-            
           var list = response.data.data.list
-          //console.log("list",list)
+          console.log("list",list)
           var totallist  =  response.data.data.totallist
-         // console.log("totallist",totallist)
+           console.log("totallist",totallist)
           this.total = totallist  
           var prescriptionList = response.data.data.prescriptionList
           this.getModeId(prescriptionList)
           
-         // console.log("prescriptionList",prescriptionList)
-          // for(let i=0;i<this.prescriptionList.length;i++){
-          //   for(let j=0;j<list.length;j++){
-          //     if(this.prescriptionList[i].patient_id == list[j].patient_id){
-          //       arr.push(this.prescriptionList[i])
-          //     }
-          //   }
-          // }
           let dataInfo = {}
           list.forEach((item, index) => {
             let { patient_id } = item
@@ -311,7 +244,7 @@ export default {
          this.getDialysisList()
          return false
       }else{
-       getPrescriptionByName(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
+       getPrescriptionByName(this.patient_id,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
          if(response.data.state === 1){
            var patients =  response.data.data.patient
            this.getModeId(patients)
@@ -416,7 +349,29 @@ export default {
           patients[i].mode_id = "IUF+HD"
         }
       }
-    }
+    },
+     querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.patient
+             console.log("searchArray",searchArray)
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+   handleSelect(val) {
+        console.log("val",val)
+        this.listQuery.search = val.name
+        this.patient_id = val.id
+        this.onSearch()
+      },
   },
   created(){
     var nowDate = new Date();

src/xt_pages/qcd/treatmentControlAnalysis/time.vue

@@ -10,9 +10,6 @@
           <el-tab-pane label="患者检验检查统计" name="second"></el-tab-pane>
         </el-tabs>
         <div class="cell clearfix">
-          <label class="title">
-            <span class="name">转归状态</span> :
-          </label>
           <div class="time">
             <ul class>
               <li
@@ -50,7 +47,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "治疗信息统计" },
         { path: false, name: "患者透析次数统计" }
       ],

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -10,24 +10,25 @@
           <el-tab-pane label="护士" name="second"></el-tab-pane>
         </el-tabs>
         <div class="cell clearfix">
-          <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
+          <el-select v-model="query.admin_user_id" placeholder="请选择" style="width:120px;margin-right:20px"               @change="changeDoctor"
+          >
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in doctor_options"
+              :key="item.id"
+              :label="item.user_name"
+              :value="item.admin_user_id"
             ></el-option>
           </el-select>
           <el-select
-            v-model="value"
+            v-model="query.statistics_type"
             placeholder="请选择"
-            @change="chooseType"
+            @change="changeProject"
             style="width:120px;margin-right:20px"
           >
             <el-option
-              v-for="item in options"
+              v-for="item in project_options"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             ></el-option>
           </el-select>
@@ -35,12 +36,13 @@
             <span class="name">日期查询</span> :
           </label>
           <el-date-picker
-            v-model="listQuery.start_time"
+            v-model="query.start_time"
             prefix-icon="el-icon-date"
             @change="changeTime"
             :editable="false"
-            style="width: 196px;"
+            style="width: 150px;"
             type="date"
+            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -48,11 +50,12 @@
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
-            v-model="listQuery.end_time"
+            v-model="query.end_time"
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            style="width: 196px;"
+            :picker-options="pickerOptions"
+            style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
             align="right"
@@ -62,31 +65,53 @@
         </div>
         <div class="tableTitle">统计图</div>
         <div>
-          <line-chart :options="chart"></line-chart>
+          <line-chart :options="bar"></line-chart>
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" border show-summary :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-            <el-table-column fixed prop="date" label="日期"></el-table-column>
-            <el-table-column prop="name" label="姓名"></el-table-column>
-            <el-table-column prop="province" label="省份"></el-table-column>
-            <el-table-column prop="city" label="市区"></el-table-column>
-            <el-table-column prop="address" label="地址"></el-table-column>
-            <el-table-column prop="zip" label="邮编"></el-table-column>
+          <el-table :data="tableData" style="width: 100%" :height="tableHeight">
+            <el-table-column fixed label="姓名" align="center">
+              <template slot-scope="scope">
+                {{scope.row.user_name}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="治疗人次" align="center">
+              <template slot-scope="scope">
+                {{scope.row.p_count?scope.row.p_count:''}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="病程记录" align="center">
+              <template slot-scope="scope">
+                {{scope.row.course_count?scope.row.course_count:''}}
+
+                <!--{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}-->
+              </template>
+            </el-table-column>
+
+            <el-table-column label="抢救记录" align="center">
+              <template slot-scope="scope">
+                {{scope.row.rescue_count?scope.row.rescue_count:''}}
+
+                <!--{{scope.row.last_after_weight?scope.row.last_after_weight:''}}-->
+
+                <!--<div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>-->
+              </template>
+            </el-table-column>
+
+            <el-table-column label="合计" align="center">
+              <template slot-scope="scope">
+                {{scope.row.p_count + scope.row.course_count + scope.row.rescue_count?scope.row.p_count + scope.row.course_count + scope.row.rescue_count:''}}
+
+                <!--<div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>-->
+              </template>
+            </el-table-column>
+
           </el-table>
 
-          <el-pagination
-            align="right"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="listQuery.page"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-          ></el-pagination>
         </div>
       </div>
     </div>
@@ -97,6 +122,9 @@
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../../qcd/components/LineChart";
+
+import {GetDoctorWorkloadChartData,GetDoctorWorkloadTableData,GetAllAdminUser} from "@/api/common/statistics";
+
 export default {
   components: {
     BreadCrumb,
@@ -104,8 +132,36 @@ export default {
   },
   data() {
     return {
+      percent:[],
+
+      pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      },
+      tableData: [
+      ],
+      loading: false,
+      total: '',
+      query: {
+        admin_user_id: "",
+        statistics_type: 1,
+        start_time: "",
+        end_time: "",
+        limit:20,
+        page:1,
+      },
+
+
+      doctor_options:[],
+      project_options:[
+        {value:1, name:"治疗"},
+        {value:2, name:"病程记录"},
+        {value:3, name:"抢救记录"}
+      ],
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "工作量分析统计" },
         { path: false, name: "医生" }
       ],
@@ -116,122 +172,19 @@ export default {
         page: 1,
         limit: 10
       },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
-      ],
+
       value: "请选项",
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ],
-      chart: {
+      bar: {
         title: {
           text: "ECharts 入门示例"
         },
         tooltip: {},
         legend: {
-          data: ["次数"],
+          data: [],
           left: 0
         },
         xAxis: {
-          data: ["达标", "未达标"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -241,15 +194,25 @@ export default {
         },
         series: [
           {
-            name: "次数",
+            name: "",
             type: "bar",
-            data: ["78.57", "50"],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: (params) => {
+                  if(this.percent.length > 0){
+                    let str = ''
+                    str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                    return str
+                  }else{
+                    let str = ''
+                    str = params.data
+                    return str
+                  }
+                }
               }
             },
             //配置样式
@@ -293,14 +256,125 @@ export default {
     };
   },
   methods: {
-    changeTime() {},
+    changeDoctor(val){
+      this.query.admin_user_id = val
+      this.query.page = 1
+      this.GetDoctorWorkloadTableData(this.query)
+
+    },
+    GetAllDoctor(){
+      GetAllAdminUser().then(response => {
+        if (response.data.state == 1) {
+          var adminUser = response.data.data.admin
+          this.admin_user  = adminUser
+          for (let i = 0; i < adminUser.length; i++){
+            if(adminUser[i].user_type == 2){
+              this.doctor_options.push(adminUser[i])
+            }
+          }
+        } else {
+          this.$message.error('请求数据失败')
+          return false
+        }
+      })
+
+    },
+    changeProject(val){
+      this.query.statistics_type = val
+      this.query.page = 1
+      this.GetDoctorWorkloadChartData(this.query)
+      // this.GetDialysisProcessIndexTableData(this.query)
+
+    },
+    handleSizeChange(limit) {
+      this.query.limit = limit;
+      this.GetDoctorWorkloadTableData(this.query)
+    },
+    handleCurrentChange(page) {
+      this.query.page = page;
+      this.GetDoctorWorkloadTableData(this.query)
+    },GetDoctorWorkloadTableData(params) {
+      this.loading = true
+      this.tableData = []
+      GetDoctorWorkloadTableData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.loading = false
+            for (let i = 0; i < resp.data.data.length; i++) {
+              this.tableData.push(resp.data.data[i])
+            }
+          } else {
+            this.loading = false
+          }
+        })
+        .catch(error => {
+
+        })
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.query.start_time = "";
+      } else {
+        // this.getDialysisList()
+        this.query.page = 1;
+        this.GetDoctorWorkloadChartData(this.query)
+        this.GetDoctorWorkloadTableData(this.query)
+
+      }
+
+    },  GetDoctorWorkloadChartData(params) {
+
+      this.bar.xAxis.data = []
+      this.bar.series[0].data = []
+      GetDoctorWorkloadChartData(params)
+        .then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+
+            for (let i = 0;  i < resp.data.data.length;i++){
+              this.bar.xAxis.data.push(resp.data.data[i].user_name)
+              if(this.query.statistics_type == 1){
+
+                this.bar.series[0].data.push(resp.data.data[i].p_count)
+                this.percent.push(resp.data.data[i].p_ratio)
+
+
+              }else if(this.query.statistics_type == 2){
+                this.bar.series[0].data.push(resp.data.data[i].course_count)
+                this.percent.push(resp.data.data[i].course_ratio)
+
+
+              }else if(this.query.statistics_type == 3){
+                this.bar.series[0].data.push(resp.data.data[i].rescue_count)
+                this.percent.push(resp.data.data[i].rescue_ratio)
+
+
+              }
+            }
+          } else {
+          }
+        })
+        .catch(error => {
+        })
+    },
     changeEndTime(val) {
       var time =
-        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+        this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
-        this.listQuery.end_time = "";
+        this.query.end_time = "";
       } else {
+        this.query.page = 1;
+        this.GetDoctorWorkloadChartData(this.query)
+        this.GetDoctorWorkloadTableData(this.query)
+
       }
     },
     handleClick() {
@@ -308,6 +382,21 @@ export default {
         this.$router.push({ path: "/qcd/workAnalysis/nurse" });
       }
     }
+  },created(){
+    var date = new Date()
+    var year = date.getFullYear() //获取完整的年份(4位)
+    var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+    var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+    var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+    this.query.patient_id = 0
+    this.query.end_time = year + '-' + month + '-' + day
+    this.query.start_time = year + '-' + last_month + '-' + day
+    this.query.statistics_type = 1
+    this.GetAllDoctor()
+    this.GetDoctorWorkloadChartData(this.query)
+    this.GetDoctorWorkloadTableData(this.query)
+
+
   }
 };
 </script>

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -10,24 +10,25 @@
           <el-tab-pane label="护士" name="second"></el-tab-pane>
         </el-tabs>
         <div class="cell clearfix">
-          <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
+          <el-select v-model="query.admin_user_id" placeholder="请选择" style="width:120px;margin-right:20px"               @change="changeNurse"
+          >
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in nurse_options"
+              :key="item.id"
+              :label="item.user_name"
+              :value="item.admin_user_id"
             ></el-option>
           </el-select>
           <el-select
-            v-model="value"
+            v-model="query.statistics_type"
             placeholder="请选择"
-            @change="chooseType"
+            @change="changeProject"
             style="width:120px;margin-right:20px"
           >
             <el-option
-              v-for="item in options"
+              v-for="item in project_options"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             ></el-option>
           </el-select>
@@ -35,12 +36,13 @@
             <span class="name">日期查询</span> :
           </label>
           <el-date-picker
-            v-model="listQuery.start_time"
+            v-model="query.start_time"
             prefix-icon="el-icon-date"
             @change="changeTime"
             :editable="false"
-            style="width: 196px;"
+            style="width: 150px;"
             type="date"
+            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -48,11 +50,12 @@
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
-            v-model="listQuery.end_time"
+            v-model="query.end_time"
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            style="width: 196px;"
+            :picker-options="pickerOptions"
+            style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
             align="right"
@@ -62,254 +65,387 @@
         </div>
         <div class="tableTitle">统计图</div>
         <div>
-          <line-chart :options="chart"></line-chart>
+          <line-chart :options="bar"></line-chart>
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" border show-summary :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-            <el-table-column fixed prop="date" label="日期"></el-table-column>
-            <el-table-column prop="name" label="姓名"></el-table-column>
-            <el-table-column prop="province" label="省份"></el-table-column>
-            <el-table-column prop="city" label="市区"></el-table-column>
-            <el-table-column prop="address" label="地址"></el-table-column>
-            <el-table-column prop="zip" label="邮编"></el-table-column>
+          <!--<el-table :data="tableData" style="width: 100%" :height="tableHeight">-->
+            <!--<el-table-column fixed label="姓名" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.user_name}}-->
+
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+            <!--<el-table-column label="治疗人次" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.p_count?scope.row.p_count:''}}-->
+
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+            <!--<el-table-column label="病程记录" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.course_count?scope.row.course_count:''}}-->
+
+                <!--&lt;!&ndash;{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}&ndash;&gt;-->
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+            <!--<el-table-column label="抢救记录" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.rescue_count?scope.row.rescue_count:''}}-->
+
+                <!--&lt;!&ndash;{{scope.row.last_after_weight?scope.row.last_after_weight:''}}&ndash;&gt;-->
+
+                <!--&lt;!&ndash;<div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>&ndash;&gt;-->
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+            <!--<el-table-column label="合计" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{scope.row.p_count + scope.row.course_count + scope.row.rescue_count?scope.row.p_count + scope.row.course_count + scope.row.rescue_count:''}}-->
+
+                <!--&lt;!&ndash;<div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>&ndash;&gt;-->
+              <!--</template>-->
+            <!--</el-table-column>-->
+
+
+          <!--</el-table>-->
+          <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+            <el-table-column fixed label="姓名" align="center">
+              <template slot-scope="scope">
+                {{scope.row.user_name}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="穿刺" align="center">
+              <template slot-scope="scope">
+                {{scope.row.puncture_count?scope.row.puncture_count:''}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="换药" align="center">
+              <template slot-scope="scope">
+                {{scope.row.change_medicine_count?scope.row.change_medicine_count:''}}
+
+                <!--{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}-->
+              </template>
+            </el-table-column>
+
+            <el-table-column label="治疗" align="center">
+              <template slot-scope="scope">
+                {{scope.row.cure_count?scope.row.cure_count:''}}
+
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="宣教/小结" align="center">
+              <template slot-scope="scope">
+                {{scope.row.mission_count?scope.row.mission_count:''}}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="合计" align="center">
+              <template slot-scope="scope">
+                {{scope.row.puncture_count + scope.row.change_medicine_count + scope.row.cure_count + scope.row.mission_count ?scope.row.puncture_count + scope.row.change_medicine_count + scope.row.cure_count + scope.row.mission_count:''}}
+              </template>
+            </el-table-column>
           </el-table>
 
-          <el-pagination
-            align="right"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="listQuery.page"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="10"
-            background
-            style="margin-top:20px;"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-          ></el-pagination>
         </div>
       </div>
     </div>
   </div>
 </template>
-
 <script>
-import echarts from "echarts";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import LineChart from "../../qcd/components/LineChart";
-export default {
-  components: {
-    BreadCrumb,
-    LineChart
-  },
-  data() {
-    return {
-      crumbs: [
-        { path: false, name: "科室质控" },
-        { path: false, name: "工作量分析统计" },
-        { path: false, name: "护士" }
-      ],
-      activeName: "second",
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
-      ],
-      value: "请选项",
-      tableData: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        }
-      ],
-      chart: {
-        title: {
-          text: "ECharts 入门示例"
+  import echarts from "echarts";
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import LineChart from "../../qcd/components/LineChart";
+
+  import {GetNurseWorkloadChartData,GetNurseWorkloadTableData,GetAllAdminUser} from "@/api/common/statistics";
+
+  export default {
+    components: {
+      BreadCrumb,
+      LineChart
+    },
+    data() {
+      return {
+        percent:[],
+        pickerOptions: {
+          disabledDate(time) {
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+            return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+          }
         },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
+        tableData: [
+        ],
+        loading: false,
+        total: '',
+        query: {
+          admin_user_id: "",
+          statistics_type: 1,
+          start_time: "",
+          end_time: "",
+          limit:20,
+          page:1,
         },
-        xAxis: {
-          data: ["达标", "未达标"]
+
+
+        nurse_options:[],
+        project_options:[
+          {value:1, name:"治疗"},
+          {value:2, name:"穿刺"},
+          {value:3, name:"换药"},
+          {value:4, name:"宣教/小结"},
+        ],
+        crumbs: [
+          { path: false, name: "质控管理" },
+          { path: false, name: "工作量分析统计" },
+          { path: false, name: "医生" }
+        ],
+        activeName: "second",
+        listQuery: {
+          start_time: "",
+          end_time: "",
+          page: 1,
+          limit: 10
         },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+
+        value: "请选项",
+        bar: {
+          title: {
+            text: "ECharts 入门示例"
           },
-          show: false
-        },
-        series: [
-          {
-            name: "次数",
-            type: "bar",
-            data: ["78.57", "50"],
-            barWidth: 30,
-            label: {
-              normal: {
-                show: true,
-                position: "top",
-                formatter: "{c}次"
-              }
+          tooltip: {},
+          legend: {
+            data: [],
+            left: 0
+          },
+          xAxis: {
+            data: []
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: "{value} %"
             },
-            //配置样式
-            itemStyle: {
-              //通常情况下：
-
-              //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
-              normal: {
-                color: function(params) {
-                  //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
-                  var colorList = [
-                    ["#A9E0F3", "#9FBDFC"],
-
-                    ["#FFD7C0", "#FF9994"]
-                  ];
-
-                  var index = params.dataIndex;
-                  if (params.dataIndex >= colorList.length) {
-                    index = params.dataIndex % colorList.length;
+            show: false
+          },
+          series: [
+            {
+              name: "",
+              type: "bar",
+              data: [],
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: "top",
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
                   }
+                }
+              },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
+
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: function(params) {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = [
+                      ["#A9E0F3", "#9FBDFC"],
+
+                      ["#FFD7C0", "#FF9994"]
+                    ];
 
-                  return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                    { offset: 0, color: colorList[index][0] },
-                    // { offset: 0.5, color: colorList[index][1] },
-                    { offset: 1, color: colorList[index][1] }
-                  ]);
+                    var index = params.dataIndex;
+                    if (params.dataIndex >= colorList.length) {
+                      index = params.dataIndex % colorList.length;
+                    }
+
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      { offset: 0, color: colorList[index][0] },
+                      // { offset: 0.5, color: colorList[index][1] },
+                      { offset: 1, color: colorList[index][1] }
+                    ]);
+                  },
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
                 },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
-              },
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: "rgba(0, 0, 0, 0.5)"
+                }
               }
             }
-          }
-        ]
-      }
-    };
-  },
-  methods: {
-    changeTime() {},
-    changeEndTime(val) {
-      var time =
-        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
-      if (time < 0) {
-        this.$message.error("结束时间不能小于开始时间");
-        this.listQuery.end_time = "";
-      } else {
-      }
+          ]
+        }
+      };
     },
-    handleClick() {
-      if (this.activeName == "first") {
-        this.$router.push({ path: "/qcd/workAnalysis/doctor" });
+    methods: {
+      changeNurse(val){
+        this.query.admin_user_id = val
+        this.query.page = 1
+        this.GetNurseWorkloadTableData(this.query)
+
+      },
+      GetAllNurse(){
+        GetAllAdminUser().then(response => {
+          if (response.data.state == 1) {
+            var adminUser = response.data.data.admin
+            this.admin_user  = adminUser
+            for (let i = 0; i < adminUser.length; i++){
+              if(adminUser[i].user_type == 3){
+                this.nurse_options.push(adminUser[i])
+              }
+            }
+          } else {
+            this.$message.error('请求数据失败')
+            return false
+          }
+        })
+
+      },
+      changeProject(val){
+        this.query.statistics_type = val
+        this.query.page = 1
+        this.GetNurseWorkloadChartData(this.query)
+        // this.GetDialysisProcessIndexTableData(this.query)
+
+      },
+      handleSizeChange(limit) {
+        this.query.limit = limit;
+        this.GetNurseWorkloadTableData(this.query)
+      },
+      handleCurrentChange(page) {
+        this.query.page = page;
+        this.GetNurseWorkloadTableData(this.query)
+      },GetNurseWorkloadTableData(params) {
+        this.loading = true
+        this.tableData = []
+        GetNurseWorkloadTableData(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              this.loading = false
+              for (let i = 0; i < resp.data.data.length; i++) {
+                this.tableData.push(resp.data.data[i])
+              }
+            } else {
+              this.loading = false
+            }
+          })
+          .catch(error => {
+
+          })
+      },
+      getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000;
+      },
+      changeTime(val) {
+        var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
+        if (time > 0) {
+          this.$message.error("结束时间不能小于开始时间");
+          this.query.start_time = "";
+        } else {
+          // this.getDialysisList()
+          this.query.page = 1;
+          this.GetNurseWorkloadChartData(this.query)
+          this.GetNurseWorkloadTableData(this.query)
+
+        }
+
+      },  GetNurseWorkloadChartData(params) {
+
+        this.bar.xAxis.data = []
+        this.bar.series[0].data = []
+        GetNurseWorkloadChartData(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+
+              for (let i = 0;  i < resp.data.data.length;i++){
+                this.bar.xAxis.data.push(resp.data.data[i].user_name)
+                if(this.query.statistics_type == 1){
+
+                  this.bar.series[0].data.push(resp.data.data[i].puncture_count)
+                  this.percent.push(resp.data.data[i].puncture_ratio)
+
+                }else if(this.query.statistics_type == 2){
+
+                  this.bar.series[0].data.push(resp.data.data[i].change_medicine_count)
+                  this.percent.push(resp.data.data[i].change_medicine_ratio)
+
+
+                }else if(this.query.statistics_type == 3){
+                  this.bar.series[0].data.push(resp.data.data[i].cure_count)
+                  this.percent.push(resp.data.data[i].cure_ratio)
+
+                }else if(this.query.statistics_type == 4){
+                  this.bar.series[0].data.push(resp.data.data[i].mission_count)
+                  this.percent.push(resp.data.data[i].mission_ratio)
+
+                }
+              }
+
+            } else {
+            }
+          })
+          .catch(error => {
+          })
+      },
+      changeEndTime(val) {
+        var time =
+          this.getTimestamp(val) - this.getTimestamp(this.query.start_time);
+        if (time < 0) {
+          this.$message.error("结束时间不能小于开始时间");
+          this.query.end_time = "";
+        } else {
+          this.query.page = 1;
+          this.GetNurseWorkloadChartData(this.query)
+          this.GetNurseWorkloadTableData(this.query)
+
+        }
+      },
+      handleClick() {
+        if (this.activeName == "first") {
+          this.$router.push({ path: "/qcd/workAnalysis/doctor" });
+        }
       }
+    },created(){
+      var date = new Date()
+      var year = date.getFullYear() //获取完整的年份(4位)
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+      var day = date.getDate() < 10 ? '0' + date.getDate().toString() : date.getDate() //获取当前日(1-31)
+      var last_month = date.getMonth() < 10 ? '0' + date.getMonth().toString() : date.getMonth() //获取当前月份(0-11,0代表1月)
+      this.query.patient_id = 0
+      this.query.end_time = year + '-' + month + '-' + day
+      this.query.start_time = year + '-' + last_month + '-' + day
+      this.query.statistics_type = 1
+      this.GetAllNurse()
+      this.GetNurseWorkloadChartData(this.query)
+      this.GetNurseWorkloadTableData(this.query)
+
+
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>

src/xt_pages/sign/index.vue

@@ -209,8 +209,6 @@ export default {
         this.patients = []
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
-          // console.log('病人信息', this.patients[0].schedule)
-          console.log('病人信息:', this.patients)
           // 将没有排班的信息排除
           for (let i = this.patients.length - 1; i >= 0; i--) {
             if (this.patients[i].schedule.id === 0) {
@@ -224,8 +222,6 @@ export default {
             var panel = response.data.data.panel
             for (let index = 0; index < sl; index++) {
               if (this.schedules[index].type in response.data.data.panel) {
-                console.log(this.schedules[index].type)
-                console.log(response.data.data.panel[this.schedules[index].type].schedule)
                 this.schedules[index].arrange = response.data.data.panel[this.schedules[index].type].schedule
                 this.schedules[index].sign = response.data.data.panel[this.schedules[index].type].sign
                 this.schedules[index].before = response.data.data.panel[this.schedules[index].type].before
@@ -241,7 +237,6 @@ export default {
         if (response.data.state === 1) {
           if (response.data.data.sign != null) {
             var sign = response.data.data.sign
-            console.log('sign是什么', sign)
             this.weigh_form.dry_weight = sign.dry_weight
             this.weigh_form.clothes_weight = sign.clothes_weight
             // 透前
@@ -281,7 +276,6 @@ export default {
       this.weigh_form.patient_id = row.id
       this.querySignParams.patient_id = row.id
       this.dialysis_stege = row.dialysis_order.stage
-      console.log('呵呵呵', this.dialysis_stege)
       this.getDialysisInforInfomation(row.id)
       this.getDialysisAfterInfomation(row.id)
       this.weigh_list.id = row.signin.id
@@ -292,11 +286,8 @@ export default {
       getDialysisInforInfomation(id).then(response => {
         if (response.data.data.patientlist != null) {
           var patientlist = response.data.data.patientlist
-          console.log('patientlist是什么?', patientlist)
           this.weigh_list.id = patientlist.id
-          console.log(this.weigh_list.id)
           this.weigh_list.dry_weight = patientlist.dry_weight
-          console.log('干体重:' + this.weigh_list.dry_weight)
           if (this.weigh_list.dry_weight === 0) {
             this.weigh_list.dry_weight = ''
           }
@@ -332,7 +323,7 @@ export default {
       getDialysisAfterInfomation(id).then(response => {
         if (response.data.data.patientinfor != null) {
           var patientinfor = response.data.data.patientinfor
-          console.log('patientInfor', patientinfor)
+
           this.weigh_infor.dry_weight = patientinfor.dry_weight
           if (this.weigh_infor.dry_weight === 0) {
             this.weigh_infor.dry_weight = ''
@@ -391,7 +382,7 @@ export default {
       params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
       params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
-
+      console.log("params",params)
       updateSignweight(params).then(response => {
         if (response.data.state === 1) {
           var signs = response.data.data.signs
@@ -403,7 +394,6 @@ export default {
           // })
         }
       })
-      console.log('params数据', params)
     },
     hide() {
       this.show = false
@@ -413,7 +403,6 @@ export default {
       // 透前数据
       var params = new Object()
       var data_time = this.querySignParams.date_time
-      console.log('data_time', data_time)
       params.date_time = data_time
       params.patient_id = this.weigh_form.patient_id
       params.dry_weight = this.weigh_list.dry_weight
@@ -430,10 +419,8 @@ export default {
       params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
       params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
-      console.log('params是什么?', params)
       sighdata(params).then(response => {
         var signs = response.data.data.signs
-        console.log('signs是什么?', signs)
         if (response.data.state === 1) {
           // this.$message({
           //   type: 'success',
@@ -444,9 +431,9 @@ export default {
           for (let index = 0; index < tlen; index++) {
             if (this.patients[index].id === params.patient_id) {
               var signin = this.patients[index].signin
-              console.log('signin是什么', signin)
+    
               var sings = response.data.data.signs
-              console.log('signs', signs)
+         
 
               this.patients[index].signin = response.data.data.signs
 

src/xt_pages/statistics/index.vue

@@ -125,7 +125,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "统计分析" }
       ],
       pageLoad: true,

src/xt_pages/user/components/PatientForm.vue

@@ -280,7 +280,7 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-show="showLapseto">
                 <el-form-item
                   label="治疗状态(转归) : "
                   class="is-required"
@@ -1225,6 +1225,7 @@ export default {
       ],
 
       subscibe: {},
+      showLapseto:true,
       rules: {
         contagions: [
           {
@@ -1275,6 +1276,9 @@ export default {
     }
   },
   created() {
+    if(this.isEdit == true){
+       this.showLapseto = false
+    }
     // this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");

src/xt_pages/user/patients.vue

@@ -476,7 +476,7 @@
           ref="lapsetoForm"
           label-width="140px"
         >
-          <el-form-item label="治疗状态（转归）:" prop="lapseto_type" required>
+          <!-- <el-form-item label="治疗状态（转归）:" prop="lapseto_type" required>
             <el-radio-group v-model="lapsetoForm.lapseto_type">
               <el-radio
                 v-for="item in lapsetoOptions"
@@ -487,6 +487,9 @@
               </el-radio
               >
             </el-radio-group>
+          </el-form-item> -->
+          <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
+              <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">{{lapeseto}}</el-radio>
           </el-form-item>
           <el-form-item label="转归时间 :" prop="lapseto_time" required>
             <el-date-picker
@@ -692,7 +695,8 @@
         phone: '',
         healthcareno: '',
         startTime: '',
-        export_date: []
+        export_date: [],
+        lapeseto:"",
       }
     },
     created() {
@@ -760,9 +764,6 @@
 
       },
       handleSuccess({ results, header }) {
-        console.log(results)
-        console.log(header)
-
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')
@@ -949,7 +950,7 @@
                       obj['diagnose'] = results[i][key]
                     }
                   }
-                  console.log(obj)
+                  // console.log(obj)
 
                   if (results[i]['透析号'] === undefined) {
                     obj['dialysis_no'] = ''
@@ -959,7 +960,7 @@
                     }
                   }
 
-                  console.log(obj)
+                  // console.log(obj)
 
                   if (results[i]['干体重(kg)'] === undefined) {
                     obj['dry_weight'] = ''
@@ -969,7 +970,7 @@
                     }
                   }
 
-                  console.log(obj)
+                  // console.log(obj)
 
                   if (results[i]['身高(cm)'] === undefined) {
                     obj['height'] = ''
@@ -979,7 +980,7 @@
                     }
                   }
 
-                  console.log(obj)
+                  // console.log(obj)
 
                   if (results[i]['家庭住址'] === undefined) {
                     obj['home_address'] = ''
@@ -998,12 +999,12 @@
               for (let i = 0; i < this.export_date.length; i++) {
                 if (this.export_date[i].dialysis_no == '') {
                   let new_dialysis_no = this.max_dialysis_no + index
-                  console.log(new_dialysis_no)
+                  // console.log(new_dialysis_no)
                   index++
                   let no = new_dialysis_no.toString()
-                  console.log(no)
+                  // console.log(no)
                   let rep = 3 - no.length
-                  console.log(rep)
+                  // console.log(rep)
                   let tempNo = ""
                   if (rep == 1){
                     tempNo = "0"
@@ -1014,7 +1015,7 @@
                   }
 
 
-                  console.log(tempNo)
+                  // console.log(tempNo)
                   if (rep > 0) {
                     no = tempNo + no
                   }
@@ -1023,7 +1024,7 @@
               }
 
 
-              console.log(this.export_date)
+              // console.log(this.export_date)
 
               var tempExportDate = this.export_date
               var tempExportDateOne = this.export_date
@@ -1110,6 +1111,12 @@
           this.$message.error('请选择时间')
           return
         }
+         if(this.lapeseto == "留治"){
+           this.lapsetoForm.lapseto_type = 1
+         }
+         if(this.lapeseto == "转出"){
+           this.lapsetoForm.lapseto_type = 2
+         }
         EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm).then(
           response => {
             if (response.data.state === 1) {
@@ -1131,6 +1138,12 @@
         )
       },
       OpenSetLapseto(row, index) {
+        if(row.lapseto == 1){
+          this.lapeseto = "转出"
+        }
+        if(row.lapseto == 2){
+          this.lapeseto = "留治"
+        }
         this.patient = row
         this.currentIndex = index
         this.lapsetoForm.lapseto_time = ''
@@ -1154,9 +1167,9 @@
         this.bindWechatDialog = true
       },
       handleCheckAllChange(val) {
-        console.log(val)
-        console.log(this.checkAll)
-        console.log(this.isIndeterminate)
+        // console.log(val)
+        // console.log(this.checkAll)
+        // console.log(this.isIndeterminate)
       },
       handleSelectionChange(val) {
         this.multipleSelection = val
@@ -1239,7 +1252,7 @@
             return false
           } else {
             this.tableData = response.data.data.patients
-             console.log('病人是', this.tableData)
+            //  console.log('病人是', this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
           }
@@ -1256,7 +1269,7 @@
             return false
           } else {
             var patient = response.data.data.patient
-            console.log('二维码病人信息', patient)
+            // console.log('二维码病人信息', patient)
             this.id = patient.id
             this.name = patient.name
             this.gender = patient.gender

src/xt_permission.js

@@ -1,59 +1,59 @@
-import router from "./router";
-import store from "./store";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
+import router from './router'
+import store from './store'
+import NProgress from 'nprogress' // progress bar
+import 'nprogress/nprogress.css' // progress bar style
 
 NProgress.configure({
   showSpinner: false
-}); // NProgress Configuration
+}) // NProgress Configuration
 
-const loginWhiteList = ["/token/verify", "/401", "/404"]; // 登录验证白名单
-const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名单
+const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名单
+const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //  store.dispatch('VerifyConfigList', []).then(() => {
-  //    next()
-  // })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //  store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //    next()
-  //  })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
 
-  NProgress.start();
+  NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))
   // alert('path:' + to.path)
   // 如果 url 带有 lt (login_token)参数，则跳转到验证 token 时等待的页面
   if (to.query.lt != null && to.query.lt.length > 0) {
     // alert('will go to verify token: ' + to.query.lt)
     next({
-      path: "/token/verify",
+      path: '/token/verify',
       query: {
         token: to.query.lt
       }
-    });
+    })
 
     // 否则 如果没有 user 信息，则前往 sso 登录
   } else if (store.getters.xt_user.user.id === 0) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
       // alert('登录白名单内，跳过登录')
-      next();
+      next()
     } else {
       // alert('前往登录')
-      window.location.href = process.env.BASE_API + "/login"; // sso 地址
+      window.location.href = process.env.BASE_API + '/login' // sso 地址
     }
 
     // 否则 如果当前 url 不需要验证访问权限，则通过
   } else if (permissionWhiteList.indexOf(to.path) !== -1) {
     // alert('权限验证白名单内，直接进入')
-    next();
+    next()
 
     // 否则 如果拥有当前 url 的权限，则通过
     // } else if (store.getters.current_role_urls.indexOf(to.path) !== -1) {
@@ -65,11 +65,11 @@ router.beforeEach((to, from, next) => {
     // console.log(store.getters.current_role_urls)
     // console.log(store.getters.current_role_urls.indexOf(to.path))
     // alert('401')
-    next();
+    next()
     // next({ path: '/404' })
   }
-});
+})
 
 router.afterEach(() => {
-  NProgress.done();
-});
+  NProgress.done()
+})