统计配置开发

src/api/common/common.js

@@ -203,3 +203,27 @@ export function getTotalDialysisCount(startime, endtime) {
     params: params
   })
 }
+
+export function getCurrentOrgPatients(params) {
+  return request({
+    url: '/com/api/getcurentorgpatients',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDialysisList(startime, endtime, page, limit) {
+  console.log('startime', startime)
+  console.log('endtime', endtime)
+  const params = {
+    startime: startime,
+    endtime: endtime,
+    page: page,
+    limit: limit
+  }
+  return request({
+    url: '/com/api/getdialysislist',
+    method: 'get',
+    params: params
+  })
+}

src/api/qcd.js

@@ -100,7 +100,6 @@ export function GetPersonICData(params) {
   })
 }
 
-
 export function GetPersonAdviceData(params) {
   return request({
     url: '/api/qcd/papersonadvicedata',

src/store/modules/xt_user.js

@@ -98,7 +98,6 @@ const xt_user = {
       state.template_info.id = cur_info.template_info.id
       state.template_info.org_id = cur_info.template_info.org_id
       state.template_info.template_id = cur_info.template_info.template_id
-
     },
 
     SET_FILEDS: (state, payload) => {
@@ -159,7 +158,6 @@ const xt_user = {
 
       state.urlfors = []
       state.fileds = []
-
     }
   },
 
@@ -177,17 +175,16 @@ const xt_user = {
       commit('SET_ZONE_SELECTED', zone_selected)
     },
     SetSubscibePatients({
-                          commit,
-                          state
-                        }) {
+      commit,
+      state
+    }) {
       commit('SET_SUBSCIBE_PATIENT')
     },
 
     VerifyToken({
-                  commit,
-                  state
-                }, token) {
-
+      commit,
+      state
+    }, token) {
       // console.log('验证 token 之前：token = ' + token)
       return new Promise((resolve, reject) => {
         var cacheInfo = getAdminUserInfoCache()
@@ -200,85 +197,84 @@ const xt_user = {
 
         // console.log('登录信息缓存：', cacheInfo)
 
-          verifyToken(token).then(response => {
-            if (response.data.state === 1) {
-              // alert('验证通过')
-              // console.log('验证通过')
-              var data = response.data.data
-              this.commit('SET_CURRENT_INFO', {
-                user: data.user,
-                cur_org_id: data.current_org_id,
-                cur_app_id: data.current_app_id,
-                org: data.org,
-                subscibe: data.subscibe,
-                template_info: data.template_info,
-                scrm_role_exist: data.scrm_role_exist,
-                cdm_role_exist: data.cdm_role_exist,
-                mall_role_exist: data.mall_role_exist
+        verifyToken(token).then(response => {
+          if (response.data.state === 1) {
+            // alert('验证通过')
+            // console.log('验证通过')
+            var data = response.data.data
+            this.commit('SET_CURRENT_INFO', {
+              user: data.user,
+              cur_org_id: data.current_org_id,
+              cur_app_id: data.current_app_id,
+              org: data.org,
+              subscibe: data.subscibe,
+              template_info: data.template_info,
+              scrm_role_exist: data.scrm_role_exist,
+              cdm_role_exist: data.cdm_role_exist,
+              mall_role_exist: data.mall_role_exist
+            })
+
+            const urlfors = data.urlfors
+            if (data.cdm_role_exist == true) {
+              console.log('有')
+              urlfors.push('/slow')
+              this.commit('SET_URLFORS', {
+                urlfors: urlfors
               })
+            } else {
+              this.commit('SET_URLFORS', {
+                urlfors: data.urlfors
+              })
+            }
 
-              let urlfors = data.urlfors
-              if(data.cdm_role_exist == true){
-                console.log("有")
-                urlfors.push("/slow")
-                this.commit('SET_URLFORS', {
-                  urlfors: urlfors
-                })
-              }else{
-                this.commit('SET_URLFORS', {
-                  urlfors: data.urlfors
-                })
-              }
-
-              if(data.scrm_role_exist == true){
-                urlfors.push("/scrm")
-                this.commit('SET_URLFORS', {
-                  urlfors: urlfors
-                })
-              }else{
-                this.commit('SET_URLFORS', {
-                  urlfors: data.urlfors
-                })
-              }
-
-              if(data.mall_role_exist == true){
-                console.log("有")
-                urlfors.push("/shop")
-                this.commit('SET_URLFORS', {
-                  urlfors: urlfors
-                })
-              }else{
-                this.commit('SET_URLFORS', {
-                  urlfors: data.urlfors
-                })
-              }
-
-
-              // this.commit('SET_URLFORS', {
-              //   urlfors: data.urlfors
-              // })
-
-              commit('SET_FILEDS', {
-                fileds: data.fileds
+            if (data.scrm_role_exist == true) {
+              urlfors.push('/scrm')
+              this.commit('SET_URLFORS', {
+                urlfors: urlfors
+              })
+            } else {
+              this.commit('SET_URLFORS', {
+                urlfors: data.urlfors
               })
-              setFiledConfigList(JSON.stringify(data.fileds))
-              cacheAdminUserInfo(JSON.stringify(data))
+            }
 
-              resolve(data.user.id)
+            if (data.mall_role_exist == true) {
+              console.log('有')
+              urlfors.push('/shop')
+              this.commit('SET_URLFORS', {
+                urlfors: urlfors
+              })
             } else {
-              alert('请求失败：' + response.data.msg)
-              reject({
-                msg: response.data.msg,
-                code: response.data.code
+              this.commit('SET_URLFORS', {
+                urlfors: data.urlfors
               })
             }
-          })
+
+            // this.commit('SET_URLFORS', {
+            //   urlfors: data.urlfors
+            // })
+
+            commit('SET_FILEDS', {
+              fileds: data.fileds
+            })
+            setFiledConfigList(JSON.stringify(data.fileds))
+            cacheAdminUserInfo(JSON.stringify(data))
+
+            resolve(data.user.id)
+          } else {
+            alert('请求失败：' + response.data.msg)
+            reject({
+              msg: response.data.msg,
+              code: response.data.code
+            })
+          }
+        })
       })
     },
     ModifyAdminUserInfo({
-                          commit,
-                          state
-                        }, params) {
+      commit,
+      state
+    }, params) {
       commit('MODIFY_USER_INFO', {
         user_name: params.user_name,
         avatar: params.avatar
@@ -299,9 +295,9 @@ const xt_user = {
       )
     },
     ModifyOrgInfo({
-                    commit,
-                    state
-                  }, params) {
+      commit,
+      state
+    }, params) {
       commit('MODIFY_ORG_INFO', {
         org_name: params.org_name,
         org_short_name: params.org_short_name
@@ -342,13 +338,13 @@ const xt_user = {
     // }
     // 登出
     FrontendLogout({
-                     commit
-                   }) {
+      commit
+    }) {
       commit('CLEAR_USER_INFO')
       removeAdminUserInfoCache()
     }, updateFiledConfigList({ commit }, object) {
-
       var oldFiledList = getFiledConfigList()
+      console.log('oldFiledList', oldFiledList)
       var infoJSON = JSON.parse(oldFiledList)
       console.log(object)
       return new Promise((resolve, reject) => {
@@ -377,10 +373,10 @@ const xt_user = {
         resolve()
       })
     }, ModifyAdminUserOrgInfo({ commit, state }, obj) {
-        this.commit('SET_CURRENT_INFO',obj)
-    },ModifyUrlInfo({ commit, state }, obj) {
+      this.commit('SET_CURRENT_INFO', obj)
+    }, ModifyUrlInfo({ commit, state }, obj) {
       this.commit('SET_URLFORS', obj)
-    },ModifyFiled({ commit, state }, obj) {
+    }, ModifyFiled({ commit, state }, obj) {
       commit('SET_FILEDS', obj)
     }
   }

src/xt_pages/data/components/dialysisSummary.vue

@@ -130,7 +130,12 @@ export default {
         })
         .catch(() => {});
     }
-  }
+  },
+    watch: {
+    'dialysis_summary_data':function(){
+        console.log("透析小结----",this.dialysis_summary_data)
+      }
+    },
 };
 </script>
 

src/xt_pages/data/showConfig.vue

@@ -134,7 +134,7 @@ export default {
   },
   created() {
     var filedList = store.getters.xt_user.fileds;
-    console.log("filedList", filedList);
+    console.log("filedList",filedList)
     var arr = [];
     for (let i = 0; i < filedList.length; i++) {
       if (filedList[i].module == 6) {

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -55,11 +55,69 @@
                 <span class="point"></span>
                 <p class="infoTitle">透析总量({{total}}次)</p>
               </div>
-            
+
               <div class="borderBox">
                <div v-for="(item,index) in modetype" :key="index">
-                <p>{{item.mode_id}}:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                 <span v-if="item.mode_id == 1">
+                    <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 == 2">
+                    <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 == 3">
+                    <p>HD+HP:{{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 == 4">
+                    <p>HP:{{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 == 5">
+                    <p>HF:{{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 == 6">
+                    <p>SCUF:{{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 == 7">
+                    <p>IUF:{{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 == 8">
+                    <p>HFHD:{{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 == 9">
+                    <p>HFHD+HP:{{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 == 10">
+                    <p>PHF:{{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 == 11">
+                    <p>HFR:{{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 == 12">
+                    <p>HDF+HP:{{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 == 13">
+                      <p>HFHD+HP:{{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 == 14">
+                      <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 == 19">
+                      <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                  </span>
                </div>
               </div>
             </div>
@@ -161,14 +219,14 @@
                 <p class="infoTitle">透龄统计</p>
               </div>
               <div class="borderBox1">
-                <p>透析龄≤12:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>12&lt;透析龄≤36:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>36≤透析龄≤60:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>透析龄 ≥60:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
+                <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>
             </div>
           </div>
@@ -225,6 +283,9 @@ export default {
       ageCount:[],
       ageTotal:0,
       otherTotal:0,
+      totalone:0,
+      totaltwo:0,
+      totalthree:0,
     };
   },
   methods: {
@@ -232,27 +293,64 @@ export default {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
-    changeTime() {},
+    changeTime(val) {
+       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);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+         //统计透析总量
+        this.getDialysisModeType(val,this.listQuery.end_time)
+        //统计转归状态
+        this.getTotalLapseCount(timeStar,timeEnd)
+        //统计男女比例
+        this.getTotalSexCount(timeStar,timeEnd)
+        //统计传染病
+        this.getTotalInfectiousCount(timeStar,timeEnd)
+        //统计年龄
+        this.getTotalAgeCount(timeStar,timeEnd)
+        //统计透析年龄
+        this.getTotalDialysisCount(timeStar,timeEnd)
+      }
+    },
     changeEndTime(val) {
+       var timeEnd=Date.parse(val)/1000
+       var timeStar =Date.parse(this.listQuery.start_time)/1000
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+          //统计透析总量
+        this.getDialysisModeType(this.listQuery.start_time,val)
+        //统计转归状态
+        this.getTotalLapseCount(timeStar,timeEnd)
+        //统计男女比例
+        this.getTotalSexCount(timeStar,timeEnd)
+        //统计传染病
+        this.getTotalInfectiousCount(timeStar,timeEnd)
+        //统计年龄
+        this.getTotalAgeCount(timeStar,timeEnd)
+        //统计透析年龄
+        this.getTotalDialysisCount(timeStar,timeEnd)
       }
     },
     selectLapseTo(state) {
+      this.stateType = state;
+      this.listQuery.state = state;
       //获取本月当前机构的透析模式
       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) 
+     // console.log("结束时间",endDate)
       var now = new Date()
-      var nowMonth = now.getMonth(); //当前月 
-      var nowYear = now.getFullYear(); //当前年 
+      var nowMonth = now.getMonth(); //当前月
+      var nowYear = now.getFullYear(); //当前年
       //本月的开始时间
-      var monthStartDate = new Date(nowYear, nowMonth, 1); 
+      var monthStartDate = new Date(nowYear, nowMonth, 1);
       var timeStar=Date.parse(monthStartDate)/1000;//s
      // console.log("本月第一天",timeStar)
       //本月的结束时间
@@ -261,8 +359,6 @@ export default {
      // console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
-         this.stateType = state;
-         this.listQuery.state = state;
        //统计透析总量
         this.getDialysisModeType(startDate,endDate)
         //统计转归状态
@@ -276,13 +372,78 @@ export default {
         //统计透析年龄
         this.getTotalDialysisCount(timeStar,timeEnd)
       }
+      //近三月
       if(state == 1){
-      
-       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
-        console.log("三月前",nowMonth)
+        const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
+        console.log("三月前",startDate)
+        var startunitx = Date.parse(startDate)/1000
+        console.log("开始时间搓",startunitx)
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        console.log("结束时间",endDate)
+         var endunitx = Date.parse(endDate)/1000
+        console.log("日期时间搓",endunitx)
+         //统计透析总量
+        this.getDialysisModeType(startDate,endDate)
+         //统计转归状态
+        this.getTotalLapseCount(startunitx,endunitx)
+        //统计男女比例
+        this.getTotalSexCount(startunitx,endunitx)
+        //统计传染病
+        this.getTotalInfectiousCount(startunitx,endunitx)
+        //统计年龄
+        this.getTotalAgeCount(startunitx,endunitx)
+        //统计透析年龄
+        this.getTotalDialysisCount(startunitx,endunitx)
       }
-      this.stateType = state;
-      this.listQuery.state = state;
+
+     //近半年
+     if(state == 2){
+        const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
+        console.log("6月前",startDate)
+        var startunitx = Date.parse(startDate)/1000
+        console.log("开始时间搓",startunitx)
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        console.log("结束时间",endDate)
+         var endunitx = Date.parse(endDate)/1000
+        console.log("日期时间搓",endunitx)
+         //统计透析总量
+        this.getDialysisModeType(startDate,endDate)
+         //统计转归状态
+        this.getTotalLapseCount(startunitx,endunitx)
+        //统计男女比例
+        this.getTotalSexCount(startunitx,endunitx)
+        //统计传染病
+        this.getTotalInfectiousCount(startunitx,endunitx)
+        //统计年龄
+        this.getTotalAgeCount(startunitx,endunitx)
+        //统计透析年龄
+        this.getTotalDialysisCount(startunitx,endunitx)
+     }
+
+     //近一年
+     if(state == 3){
+        const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
+        console.log("6月前",startDate)
+        var startunitx = Date.parse(startDate)/1000
+        console.log("开始时间搓",startunitx)
+        const endDate = moment(new Date()).format('YYYY-MM-DD')
+        console.log("结束时间",endDate)
+         var endunitx = Date.parse(endDate)/1000
+        console.log("日期时间搓",endunitx)
+         //统计透析总量
+        this.getDialysisModeType(startDate,endDate)
+         //统计转归状态
+        this.getTotalLapseCount(startunitx,endunitx)
+        //统计男女比例
+        this.getTotalSexCount(startunitx,endunitx)
+        //统计传染病
+        this.getTotalInfectiousCount(startunitx,endunitx)
+        //统计年龄
+        this.getTotalAgeCount(startunitx,endunitx)
+        //统计透析年龄
+        this.getTotalDialysisCount(startunitx,endunitx)
+     }
+
     },
     getDialysisModeType(startDate,endDate){
       getDialysisModeType(startDate,endDate).then(response=>{
@@ -292,56 +453,56 @@ export default {
             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"
-             }
-           }
+           // 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)
-         
+
          }
       })
     },
@@ -399,7 +560,7 @@ export default {
             //   if(infectious[i].disease_id == 6){
             //     infectious[i].disease_id = "梅毒"
             //   }
-               
+
             // }
              var otherTotal = response.data.data.otherTotal
              this.otherTotal = otherTotal
@@ -416,7 +577,7 @@ export default {
           this.ageTotal =  response.data.data.total
          // var two = response.data.data.two
         //  console.log("two",two)
-       
+
          }
       })
     },
@@ -424,21 +585,36 @@ export default {
     getTotalDialysisCount(timeStar,timeEnd){
       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 now = new Date()
-           var nowMonth = now.getMonth(); //当前月 
-           var nowYear = now.getFullYear(); //当前年 
-           var notime =  moment(new Date()).format('YYYY-MM-DD')
-           var nowdataunix =  Date.parse(notime)/1000
-           console.log("档期是---------------",nowdataunix)
+           var arr =[]
+           var arrtwo = []
+           var arrthree = []
            for(let i=0;i<patients.length;i++){
-             if(patients[i].first_dialysis_date){
+             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)
-          
+
          }
       })
     }
@@ -448,12 +624,12 @@ export default {
       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) 
+     // console.log("结束时间",endDate)
       var now = new Date()
-      var nowMonth = now.getMonth(); //当前月 
-      var nowYear = now.getFullYear(); //当前年 
+      var nowMonth = now.getMonth(); //当前月
+      var nowYear = now.getFullYear(); //当前年
       //本月的开始时间
-      var monthStartDate = new Date(nowYear, nowMonth, 1); 
+      var monthStartDate = new Date(nowYear, nowMonth, 1);
       var timeStar=Date.parse(monthStartDate)/1000;//s
      // console.log("本月第一天",timeStar)
       //本月的结束时间

src/xt_pages/qcd/patientAnalysis/dialysisAge.vue

@@ -246,9 +246,11 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+           
             this.tableData = [];
             this.total = response.data.data.total;
             var patients = response.data.data.patients;
+            console.log("patients---",patients)
             for (const index in patients) {
                 this.tableData.push(patients[index]);
             }
@@ -257,6 +259,7 @@ export default {
                 series:[],
             };
             var counts = response.data.data.counts;
+            console.log("counts",counts)
             var otherCount = 0;
             for (const index in counts) {
               if (counts[index].age in this.dialysisAgeMap) {

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -96,6 +96,7 @@
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../qcd/components/LineChart";
+import { uParseTime } from "@/utils/tools";
 export default {
   components: {
     LineChart,
@@ -266,7 +267,18 @@ export default {
     },
     clickQuality(index) {
       this.quality = index;
-    }
+    },
+    handleSizeChange(limit) {
+      //this.limit = limit;
+      //this.getConfigurationList();
+    },
+    handleCurrentChange(page) {
+      //this.page = page;
+      //this.getConfigurationList();
+    },
+    getTime(time) {
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
   }
 };
 </script>

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

@@ -7,14 +7,6 @@
           <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
         </el-form-item>
       </el-form>
-      <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>
       <label class="title">
         <span class="name">日期查询</span> :
       </label>
@@ -47,20 +39,31 @@
     <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">
+          <el-table-column prop="date" label="日期" width="70">
+            <template slot-scope="scope">{{getTime(scope.row.created_time)}}</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>
-        <el-table :data="tableData1" style="width: 100%" border>
-          <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="DialysisData" style="width: 100%" border>
+          <el-table-column fixed prop="date" label="姓名">
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+          <el-table-column prop="name" label="年龄">
+             <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
+          </el-table-column>
+          <el-table-column prop="province" label="透析号">
+              <template slot-scope="scope">{{ scope.row.dialysis_no }}</template>
+          </el-table-column>
+          <el-table-column prop="city" label="透析模式">
+              <template slot-scope="scope">{{ scope.row.mode_id }}</template>
+           </el-table-column>
+          <el-table-column prop="address" label="透析总次数"></el-table-column>
         </el-table>
 
         <el-pagination
@@ -82,6 +85,8 @@
 
 
 <script>
+ import { getCurrentOrgPatients,getDialysisList } from "@/api/common/common";
+ import { uParseTime } from "@/utils/tools";
 export default {
   data() {
     return {
@@ -89,163 +94,14 @@ export default {
         start_time: "",
         end_time: "",
         page: 1,
-        limit: 10
+        limit: 20
       },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
-      ],
+      total:0,
+      options: [],
       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: "王小虎"
-        }
-      ],
-      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
-        }
-      ]
+      tableData: [],
+      DialysisData: [],
+      patientsData:[],
     };
   },
   methods: {
@@ -258,7 +114,58 @@ export default {
         this.listQuery.end_time = "";
       } else {
       }
+    },
+    getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+         if(response.data.state == 1){
+           var patients = response.data.data.patients
+           console.log("病人列表3",patients)
+           this.patientsData = patients
+         }
+      })
+    },
+    getTime(time) {
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    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
+           console.log("dialysislist",dialysislist)
+           this.DialysisData = dialysislist
+           var total = response.data.data.total
+           console.log("total",total)
+           this.total = total
+         }
+      })
     }
+  },
+  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.getCurrentOrgPatients()
+     //统计列表
+     this.getDialysisList()
   }
 };
 </script>