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

src/api/common/common.js

@@ -406,3 +406,20 @@ export function getMonthProjectList(params) {
     params: params
   })
 }
+
+export function getPatientsControl(lapstor, startime, endtime, page, limit) {
+  const params = {
+    lapstor: lapstor,
+    startime: startime,
+    endtime: endtime,
+    page: page,
+    limit: limit
+  }
+  console.log('params', params)
+  return request({
+    url: '/com/api/getpatientscontrol',
+    method: 'get',
+    params: params
+  })
+}
+

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -12,7 +12,7 @@
               <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
             </el-form-item>
           </el-form>
-          <el-select v-model="value" placeholder="请选择" style="margin-right:20px;width:100px">
+          <el-select v-model="lapstor" placeholder="请选择" style="margin-right:20px;width:100px">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -34,6 +34,7 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
@@ -47,6 +48,7 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
           ></el-date-picker>
         </div>
         <div class="cell clearfix">
@@ -60,12 +62,20 @@
         </div>
         <div>
           <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-            <el-table-column fixed prop="date" label="日期" width="150"></el-table-column>
-            <el-table-column prop="name" label="姓名" width="120"></el-table-column>
-            <el-table-column prop="province" label="省份" width="120"></el-table-column>
-            <el-table-column prop="city" label="市区" width="120"></el-table-column>
-            <el-table-column prop="address" label="地址" width="300"></el-table-column>
-            <el-table-column prop="zip" label="邮编" width="120"></el-table-column>
+            <el-table-column fixed prop="name" label="姓名" width="120"></el-table-column>
+            <el-table-column  prop="dialysis_no" label="透析号" width="150"></el-table-column>
+            <el-table-column
+              :label="modeItem.item_name"
+              property="number"
+              align="center"
+              min-width="100"
+              v-for="(modeItem, index) in normData"
+              :key="index"
+            >
+            <template slot-scope="scope">          
+              {{ scope.row.data[index].Count}} 
+            </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>
@@ -95,6 +105,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"
 export default {
   components: {
     LineChart,
@@ -102,6 +113,12 @@ 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: "患者质控达标统计" }
@@ -112,27 +129,21 @@ export default {
         page: 1,
         limit: 10
       },
+      total:0,
+      lapstor:0,
       options: [
         {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
+          value: 0,
+          label: "全部"
         },
         {
-          value: "选项3",
-          label: "蚵仔煎"
+          value: 1,
+          label: "留治"
         },
         {
-          value: "选项4",
-          label: "龙须面"
+          value: "2",
+          label: "转出"
         },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
       ],
       value: "",
       chart: {
@@ -204,44 +215,33 @@ export default {
           }
         ]
       },
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1517 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1519 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1516 弄",
-          zip: 200333
-        }
-      ]
+      tableData: [],
+      normData:[],
+      paitents:[],
+      tableName:[],
+      total:0,
+      ObjectData:{},
     };
   },
   methods: {
-    changeTime() {},
+    handleSizeChange(limit){
+      this.listQuery.limit = limit 
+      this.getlist()    
+    },
+    handleCurrentChange(page){
+      this.listQuery.page = page
+      this.getlist()
+    },
+    changeTime() {
+        var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.start_time = "";
+      } else {
+       
+      }
+      
+    },
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
@@ -251,10 +251,160 @@ export default {
       } else {
       }
     },
+  getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     handleClick(row) {
       console.log(row);
       this.$router.push({ path: "/qcd/patientComplianceDetails" });
+    },
+    getNormData(){
+      getNormData().then(response=>{
+         if(response.data.state == 1){
+           var normdata = response.data.data.normdata
+           console.log("normdata",normdata)
+           
+           var a=[];
+           for(let i=0;i<normdata.length;i++){
+             a.push(normdata[i])
+           }
+           console.log("a",a)
+           this.newArr = a
+           var arr = this.arrayToObj(a)
+           
+           console.log("娃哈哈",arr)
+           this.ObjectData = arr
+
+           this.normData = normdata
+         }
+      })
+    },
+    onSearch(){
+    },
+    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.tableData = 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 arr = []
+          for(let i=0;i<control.length;i++){
+            for(let  j=0;j<this.normData.length;j++){
+               if(control[i].item_id == this.normData[j].inspection_minor){
+                  arr.push(control[i])
+               }
+            }
+          }
+          console.log("arr",arr)
+          let dataInfo = {}
+          arr.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
+              }
+            }
+          })
+          console.log("arr",arr)
+          let list = Object.values(dataInfo)  
+          list.map(item => {
+            for (let i = 0; i < arr.length; i++) {
+               if (item.inspect_date == arr[i].inspect_date && item.patient_id == arr[i].patient_id) {
+                   item.child.push(arr[i])
+                }
+              }
+            })
+           console.log("list",list)
+           var arrtwo = []
+            list.map(item =>{
+               item.child.map(item=>{
+                  arrtwo.push(item)
+               })
+            })
+
+          console.log("arrtwo",arrtwo)
+
+           var dd = {};
+           for (const index in arrtwo) {
+            if (!(arrtwo[index].name in dd)) {
+               dd[arrtwo[index].name] = {};
+            }
+            if (!(arrtwo[index].item_name in dd[arrtwo[index].name]) && arrtwo[index].item_name != 0) {
+              dd[arrtwo[index].name][arrtwo[index].item_name] = arrtwo[index];
+
+            }
+          }
+          console.log("ddd",dd)
+          console.log("obj",this.ObjectData)
+          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] = {
+                    ItemName: this.ObjectData[mkey].item_name,
+                    name: mkey,
+                    Count: 0
+                  };
+                }
+              }
+              this.tableData.push({ name: key, data: dd[key]});
+            }
+            console.log("表",this.tableData)
+             let projectArr = []
+            this.newArr.map(item => {
+              projectArr.push(item.item_name)
+            })
+            this.tableData.map(item => {
+            // console.log("item---",item.data)
+              let arr = Object.values(item.data);
+             
+              arr.sort((a,b)=>{
+                return projectArr.indexOf(a.item_name)-projectArr.indexOf(b.item_name);
+              });
+              item.data = arr
+            })
+         }
+      })
+    },
+     arrayToObj(arr){
+      return Object.assign({},arr);
     }
+  },
+  created(){
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.listQuery.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 3);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.listQuery.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    
+    //获取系统指标
+    this.getNormData()
+    //获取列表数据
+    this.getlist()
   }
 };
 </script>

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

@@ -208,55 +208,6 @@ export default {
            var total = response.data.data.total
            console.log("total",total)
            this.total = total
-          //  var arrlist = response.data.data.list
-          //   console.log("list",arrlist)
-          //   let listInfo = []
-          //  for(let i=0;i<arrlist.length;i++){
-          //    for(let j=0;j<this.tableName.length;j++){
-          //       if(arrlist[i].ProjectId == this.tableName[j].inspection_major){
-          //          listInfo.push(arrlist[i])
-          //       }
-          //    }
-          //  }
-          //   let dataInfo = {}
-          //   listInfo.forEach((item, index) => {
-          //     let { PatientId } = item
-          //     if (!dataInfo[PatientId]) {
-          //       dataInfo[PatientId] = {
-          //         PatientId,
-          //         name:item.name,
-          //         child: []
-          //       }
-          //     }
-          //   })
-          //   console.log("dataInfo",dataInfo)
-          //   let list = Object.values(dataInfo)
-          //   list.map(item => {
-          //     for (let i = 0; i < listInfo.length; i++) {
-          //       if (
-          //         item.PatientId === listInfo[i].PatientId
-          //       ) {
-          //         item.child.push(listInfo[i])
-          //       }
-          //     }
-          //   })
-          // var arrpatient = []
-          //  console.log("arr",list)
-          //    list.map(item => {
-          //     for (let i = 0; i < patientInfo.length; i++) {
-          //       if (
-          //         item.PatientId === patientInfo[i].patient_id
-          //       ) {
-          //          arrpatient.push(item)
-          //       }
-          //     }
-          //   })
-          // console.log("arrpatient",arrpatient)
-          //
-          // this.tableData = patientInfo
-
-
-
           var list = response.data.data.list
           console.log("list",list)
           var dtd = []
@@ -278,6 +229,7 @@ export default {
             }
           }
           console.log("ddd",dd)
+           console.log("this.ObjectData",this.ObjectData)
             for(const key in dd){
               for(const mkey in this.ObjectData){
                 if (!(this.ObjectData[mkey].project_name in dd[key])) {
@@ -306,7 +258,6 @@ export default {
       })
     },
     handleChange(val){
-      console.log(1111111111,val)
       getPatientDetailCheck(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var checkDetail =  response.data.data.checkDetail

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

@@ -182,7 +182,15 @@ export default {
     };
   },
   methods: {
-    changeTime() {},
+    changeTime() {
+        var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.start_time = "";
+      } else {
+       
+      }
+    },
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
@@ -192,6 +200,10 @@ export default {
       } else {
       }
     },
+   getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     getCurrentOrgPatients(){
       getCurrentOrgPatients().then(response=>{
          var patients = response.data.data.patients