统计配置开发

src/api/common/common.js

@@ -423,3 +423,34 @@ 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) {
+  return request({
+    url: '/com/api/getqualitycontrol',
+    method: 'Get',
+    params: params
+  })
+}

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/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/qcd/patientComplianceDetails.vue

@@ -7,16 +7,16 @@
       <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-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="patientsData" border style="width: 100%;" height="500">
+            <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}}
@@ -58,6 +58,7 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
               ></el-date-picker>
               <span class>-</span>
               <el-date-picker
@@ -71,6 +72,7 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
               ></el-date-picker>
             </div>
             <div class="tableTitle">指标监控</div>
@@ -78,14 +80,15 @@
               <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>
+                  <i class="iconfont icon-gou gou"></i>
+<!--                  <i class="iconfont icon-gantanhao gth" v-if="index % 2 == 0"></i>-->
+<!--                  <i class="iconfont icon-gou gou" v-else></i>-->
                 </div>
               </div>
             </div>
@@ -101,12 +104,13 @@
 </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 } from "@/api/common/common"
-export default { 
+import { getCurrentOrgPatients,GetQualityControl,getNormData } from "@/api/common/common"
+export default {
   components: {
     LineChart,
     BreadCrumb
@@ -118,68 +122,33 @@ export default {
         { path: false, name: "患者达标详情" }
       ],
       patientsData:[],
-      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: "王小虎"
-        }
-      ],
+      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,
@@ -221,7 +190,7 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}g/L"
               }
             },
             //配置样式
@@ -273,10 +242,65 @@ export default {
   },
   methods: {
     chooseMonth(month) {
+      //一月
+      if(month == 0){
+        const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
+        console.log("开始时间",startDate)
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        console.log("结束时间",endDate)
+        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 = new Date(nowYear, nowMonth+1, 0);
+        this.endtime =Date.parse(monthEndDate)/1000-1;//s
+        this.getlist()
+      }
+
+      //近三月
+      if(month == 1){
+        const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
+        console.log("三月前",startDate)
+        this.startime = Date.parse(startDate)/1000
+        console.log("开始时间搓",this.startime)
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        console.log("结束时间",endDate)
+        this.endtime = Date.parse(endDate)/1000
+        console.log("日期时间搓",this.endtime)
+        this.getlist()
+      }
+      console.log("month",month)
+
+       //近半年
+      if(month == 2){
+        const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
+        console.log("6月前",startDate)
+        this.startime = Date.parse(startDate)/1000
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        this.endtime = Date.parse(endDate)/1000
+        this.getlist()
+      }
+
+      //近一年
+      if(month == 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.getlist()
+      }
+
+
       this.monthType = month;
     },
-    clickQuality(index) {
+    clickQuality(index,itemid) {
       this.quality = index;
+      this.item_id = itemid
+      this.getlist()
     },
     handleSizeChange(limit) {
       //this.limit = limit;
@@ -289,6 +313,39 @@ 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.getlist()
+      }
+
+    },
+    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.getlist()
+        }
+
+    },
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    handleChange(val){
+     this.patientid = val.id
+      this.getlist()
+    },
    getCurrentOrgPatients(){
       getCurrentOrgPatients().then(response=>{
           if(response.data.state == 1){
@@ -298,11 +355,71 @@ export default {
           }
       })
     },
+    getNormData(){
+      getNormData().then(response=>{
+         var normdata = response.data.data.normdata
+          console.log("normdata",normdata)
+          for(let i=0;i<normdata.length;i++){
+            this.item_id = normdata[0].inspection_minor
+            console.log("item_id",this.item_id)
+          }
+          this.normData = normdata
+          this.getlist()
+      })
+    },
+    getlist(){
+        this.modesData.series = []
+        this.modesData.xAxis = []
+
+        const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
+        console.log("开始时间",startDate)
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        console.log("结束时间",endDate)
+        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 = new Date(nowYear, nowMonth+1, 0);
+        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)
+       GetQualityControl(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("list",list)
+            for(let i=0;i<list.length;i++){
+              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
+            console.log(2222,this.modesData)
+          }
+
+       })
+    }
   },
 
    created(){
+     this.patientid =  this.$route.query.patientid
+     //获取指标项
+      this.getNormData()
      //获取该机构下的所有患者
-     this.getCurrentOrgPatients()
+      this.getCurrentOrgPatients()
+
+
   }
 };
 </script>

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -77,12 +77,15 @@
               :key="index"
             >
             <template slot-scope="scope">
-              {{ scope.row.data[index].inspect_value}}
+                 <span v-if="scope.row.data[index].inspect_value == ''">0</span>
+                 <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) < parseInt(scope.row.data[index].range_min))">{{scope.row.data[index].inspect_value}}↓</span>
+                <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) > parseInt(scope.row.data[index].range_max))">{{scope.row.data[index].inspect_value}}↑</span>
+                <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) >= parseInt(scope.row.data[index].range_min))&& (parseInt(scope.row.data[index].inspect_value) <= parseInt(scope.row.data[index].range_max)) ">{{scope.row.data[index].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.name)" type="text" size="small">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -109,7 +112,7 @@
 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 } from "@/api/common/common"
 export default {
   components: {
     LineChart,
@@ -150,6 +153,10 @@ export default {
         },
       ],
       value: "",
+      modesData: {
+        xAxis: [],
+        series: []
+      },
       chart: {
         title: {
           text: "ECharts 入门示例"
@@ -178,7 +185,7 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}%"
               }
             },
             //配置样式
@@ -227,6 +234,14 @@ export default {
       ObjectData:{},
       tablePatients:[],
       tableSort:[],
+      dataName:[
+        {id:0,name:"达标"},
+        {id:1,name:"未达标"},
+      ],
+      dataCount:[
+         {id:0,count:0},
+         {id:1,count:0}
+      ]
     };
   },
   methods: {
@@ -262,8 +277,16 @@ export default {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
-    handleClick(row) {
-      this.$router.push({ path: "/qcd/patientComplianceDetails" });
+    handleClick(name) {
+      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="+id});
     },
     getDialysisNo(name){
         for(let i=0;i<this.tablePatients.length;i++){
@@ -294,21 +317,63 @@ export default {
       })
     },
     onSearch(){
+         const params = {
+            lapstor:this.lapstor,
+            keyword:this.listQuery.search,
+            startime:this.listQuery.start_time,
+            endtime:this.listQuery.end_time,
+
+         }
+         console.log("params",params)
+       getPatientContorlAnalysis(params).then(response=>{
+           if(response.data.state == 1){
+              var patientcontorDetail = response.data.data.patientcontorDetail
+              console.log("patient",patientcontorDetail)
+              var name = response.data.data.name
+              console.log("name",name)
+              //统计配置的模块
+              var inspectdate = ""
+              for(let i=0;i<patientcontorDetail.length;i++){
+                 inspectdate = patientcontorDetail[0].inspect_date
+              }
+            //  console.log("日期",inspectdate)
+
+              var arr=[]
+              for(let i=0;i<patientcontorDetail.length;i++){
+                 if(patientcontorDetail[i].inspect_date == inspectdate){
+                    arr.push(patientcontorDetail[i])
+                 }
+              }
+             // console.log("arr",arr)
+
+             // console.log("表数据",this.tableData)
+              var arrtwo = []
+              for(let i=0;i<this.tableData.length;i++){
+                 if(name == this.tableData[i].name){
+                    arrtwo.push(this.tableData[i])
+                 }
+              }
+              console.log("arrtwo",arrtwo)
+              this.tableData = []
+              this.tableData = arrtwo
+           }
+       })
     },
     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++){
+             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])
@@ -376,8 +441,6 @@ export default {
                dd[arrthree[index].name][arrthree[index].item_name] = arrthree[index];
             }
           }
-        console.log("ddd",dd)
-         console.log("obj",this.ObjectData)
           this.tableData= []
 
           for(const key in dd){
@@ -398,7 +461,7 @@ export default {
             this.newArr.map(item => {
               projectArr.push(item.item_name)
             })
-            console.log("projectArr",projectArr)
+           // console.log("projectArr",projectArr)
 
             this.tableData.map(item => {
             // console.log("item---",item.data)
@@ -410,9 +473,9 @@ export default {
                 return projectArr.indexOf(a.item_name)-projectArr.indexOf(b.item_name);
               });
               item.data = newarr
-              console.log(1111111111,item.data)
+             // console.log(1111111111,item.data)
             })
-              console.log("表",this.tableData)
+             console.log("表",this.tableData)
          }
       })
     },
@@ -440,9 +503,126 @@ 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
+               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 { patient_id } = item
+                  if (!dataInfo[patient_id]) {
+                    dataInfo[patient_id] = {
+                      patient_id,
+                      name:item.name,
+                      child: [],
+                      inspect_date:item.inspect_date,
+                      total: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])
+                         item.total++
+                    }
+                 }
+              })
+
+
+
+             list.map(item=>{
+                item.child.map(it=>{
+                   arr.push(it)
+                })
+             })
+              console.log("arr",arr)
+
+             var arrtwo = []
+             for(let i=0;i<arr.length;i++){
+               if(parseInt(arr[i].range_min)<= parseInt(arr[i].inspect_value) && parseInt(arr[i].inspect_value)<=parseInt(arr[i].range_max )){
+                  arrtwo.push(arr[i])
+               }
+             }
+             console.log("arrtwo",arrtwo)
+
+             let objinfo = {}
+                arrtwo.forEach((item, index) => {
+                  let { patient_id } = item
+                  if (!objinfo[patient_id]) {
+                    objinfo[patient_id] = {
+                      patient_id,
+                      name:item.name,
+                      child: [],
+                      inspect_date:item.inspect_date,
+                      count:0,
+                    }
+                  }
+                })
+              let newlist = Object.values(objinfo)
+              newlist.map(item=>{
+                 for(let i=0;i<arrtwo.length;i++){
+                    if(arrtwo[i].patient_id == item.patient_id && arrtwo[i].inspect_date == item.inspect_date){
+                       item.child.push(arrtwo[i])
+                    }
+                 }
+              })
+              console.log("newlist",newlist)
+              newlist.map(item=>{
+                  item.child.map(it=>{
+                    if(parseInt(it.range_min)<= parseInt(it.inspect_value) && parseInt(it.inspect_value)<=parseInt(it.range_max )){
+                       item.count ++
+                    }
+                  })
+              })
+              console.log("newlist",newlist)
+
+
+              var newtotal = 0
+
+              list.map(item=>{
+                 for(let i=0;i<newlist.length;i++){
+                    if(item.patient_id == newlist[i].patient_id && item.total == newlist[i].count){
+                       newtotal ++
+                    }
+                 }
+              })
+             console.log("newtotal",newtotal)
+             var totalCount = totaltwo - newtotal
+              console.log("totalCount",totaltwo)
+             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.dataCount[0].count = newtotal
+                this.dataCount[1].count =  totalCount
+             }
+
+             for(let i=0;i<this.dataCount.length;i++){
+                this.modesData.series.push(((this.dataCount[i].count/totaltwo)*100).toFixed(1));
+             }
+              this.chart.series[0].data = this.modesData.series
+              this.chart.xAxis.data = this.modesData.xAxis
+           }
+       })
+    }
   },
   created(){
     var nowDate = new Date();
@@ -466,10 +646,15 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
+
+
+
     //获取系统指标
     this.getNormData()
     //获取列表数据
     this.getlist()
+    //获取统计图数据
+    this.getCartogramlist()
   }
 };
 </script>

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

@@ -274,6 +274,7 @@ export default {
                  }
               }
             }
+           // console.log("arr",arr)
             let projectArr = []
             this.newArr.map(item => {
               projectArr.push(item.project_name)