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

src/api/common/common.js

@@ -203,3 +203,206 @@ 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) {
+  const params = {
+    startime: startime,
+    endtime: endtime,
+    page: page,
+    limit: limit
+  }
+  return request({
+    url: '/com/api/getdialysislist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getLastSort(params) {
+  return request({
+    url: '/com/api/getlastsort',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getLastCheckList(params) {
+  return request({
+    url: '/com/api/getlastchecklist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDialysisDetailById(id, startime, endtime, limit, page) {
+  const params = {
+    id: id,
+    startime: startime,
+    endtime: endtime,
+    limit: limit,
+    page: page
+  }
+  return request({
+    url: '/com/api/getdialysisdetailbyid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getPrescriptionByName(keyword, startime, endtime, limit, page) {
+  const params = {
+    keyword: keyword,
+    startime: startime,
+    endtime: endtime,
+    limit: limit,
+    page: page
+  }
+  return request({
+    url: '/com/api/getprescriptionbyname',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function geStatistics(params) {
+  return request({
+    url: '/com/api/getstatistics',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getInspectionTotalCount(startime, endtime) {
+  const params = {
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/getinspectiontotalcount',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getInspectionDetailById(id, startime, endtime) {
+  const params = {
+    id: id,
+    startime: startime,
+    endtime: endtime
+  }
+  console.log('startime', params)
+  return request({
+    url: '/com/api/getinspectionDetailById',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSearchPatientInfo(keyword, startime, endtime) {
+  const params = {
+    keyword: keyword,
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/getsearchpatientinfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllMajorInspection(params) {
+  return request({
+    url: '/com/api/getallmajorInspection',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPatientList(startime, endtime, limit, page) {
+  const params = {
+    startime: startime,
+    endtime: endtime,
+    limit: limit,
+    page: page
+  }
+  return request({
+    url: '/com/api/getpatientlist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPatientDetailCheck(id, startime, endtime) {
+  const params = {
+    id: id,
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/getPatientDetailCheck',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SearchDetailCheck(keyword, startime, endtime) {
+  const params = {
+    keyword: keyword,
+    startime: startime,
+    endtime: endtime
+  }
+
+  return request({
+    url: '/com/api/searchdetailcheck',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getNormData(params) {
+  return request({
+    url: '/com/api/getnormdata',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getFirstQuarter(lapseto, startime, endtime) {
+  const params = {
+    lapseto: lapseto,
+    startime: startime,
+    endtime: endtime
+  }
+  console.log('params', params)
+  return request({
+    url: '/com/api/getfirstquarter',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getProjectList(params) {
+  console.log('params', params)
+  return request({
+    url: '/com/api/getprojectlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMonthProjectList(params) {
+  return request({
+    url: '/com/api/getmonthprojectlist',
+    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/router/modules/dialysis.js

@@ -189,7 +189,19 @@ export default {
         import("@/xt_pages/dialysis/batch_print/batch_print_order_twelve"),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_nine",
+      name: "dialysis_batch_twelve",
+      meta: {
+        title: "批量打印",
+        noCache: true
+      }
+    },
+    {
+      path: "/dialysis/print/batch/thirteen",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_thirteen"),
+      hidden: true,
+      is_menu: false,
+      name: "dialysis_batch_thirteen",
       meta: {
         title: "批量打印",
         noCache: true

src/router/modules/qcd.js

@@ -7,66 +7,66 @@ export default {
   name: "qcd",
   alwaysShow: true,
   meta: {
-    title: "科室质控",
+    title: "质控管理",
     icon: "statistics"
   },
   children: [
-    {
-      path: "/statistics/index",
-      component: () => import("@/xt_pages/statistics/index"),
-      name: "statistics",
-      meta: {
-        title: "statistics",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/dialysistotal",
-      component: () => import("@/xt_pages/qcd/dialysisTotal"),
-      name: "dialysistotal",
-      meta: {
-        title: "透析总量",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/processindicators",
-      component: () => import("@/xt_pages/qcd/processIndicators"),
-      name: "processIndicators",
-      meta: {
-        title: "过程指标",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/outcomeIndicators/control",
-      component: () => import("@/xt_pages/qcd/outcomeIndicators/control"),
-      name: "outcomeIndicatorsControl",
-      meta: {
-        title: "结果指标",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/outcomeIndicators/query",
-      hidden: true,
-      is_menu: false,
-      component: () => import("@/xt_pages/qcd/outcomeIndicators/query"),
-      name: "outcomeIndicatorsQuery",
-      meta: {
-        title: "指标查询",
-        noCache: true
-      }
-    },
-    {
-      path: "/qcd/patientanalysis/total",
-      component: () => import("@/xt_pages/qcd/patientAnalysis/total"),
-      name: "patientAnalysisTotal",
-      meta: {
-        title: "患者分析",
-        noCache: true
-      }
-    },
+    // {
+    //   path: "/statistics/index",
+    //   component: () => import("@/xt_pages/statistics/index"),
+    //   name: "statistics",
+    //   meta: {
+    //     title: "statistics",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/dialysistotal",
+    //   component: () => import("@/xt_pages/qcd/dialysisTotal"),
+    //   name: "dialysistotal",
+    //   meta: {
+    //     title: "透析总量",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/processindicators",
+    //   component: () => import("@/xt_pages/qcd/processIndicators"),
+    //   name: "processIndicators",
+    //   meta: {
+    //     title: "过程指标",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/outcomeIndicators/control",
+    //   component: () => import("@/xt_pages/qcd/outcomeIndicators/control"),
+    //   name: "outcomeIndicatorsControl",
+    //   meta: {
+    //     title: "结果指标",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/outcomeIndicators/query",
+    //   hidden: true,
+    //   is_menu: false,
+    //   component: () => import("@/xt_pages/qcd/outcomeIndicators/query"),
+    //   name: "outcomeIndicatorsQuery",
+    //   meta: {
+    //     title: "指标查询",
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: "/qcd/patientanalysis/total",
+    //   component: () => import("@/xt_pages/qcd/patientAnalysis/total"),
+    //   name: "patientAnalysisTotal",
+    //   meta: {
+    //     title: "患者分析",
+    //     noCache: true
+    //   }
+    // },
     {
       path: "/qcd/patientanalysis/statisticalConfig",
       component: () => import("@/xt_pages/qcd/statisticalConfiguration"),
@@ -244,7 +244,7 @@ export default {
       component: () => import("@/xt_pages/qcd/workAnalysis/doctor"),
       name: "workAnalysisDoctor",
       meta: {
-        title: "工作量分析统计医生",
+        title: "工作量分析统计",
         noCache: true
       }
     },

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/dialysis/batch_print/batch_print_order_eight.vue

@@ -1719,6 +1719,7 @@ export default {
       })
     },
     getPartName(id) {
+      console.log("id",id)
       for (let i = 0; i < this.bloodAccess.length; i++) {
         if ((this.bloodAccess[i].id = id)) {
           return this.bloodAccess[i].name;

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -140,6 +140,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 13">
+        <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">
@@ -643,6 +653,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/nine" });
       } else if (this.template_id == 12) {
         this.$router.push({ path: "/dialysis/print/batch/twelve" });
+      } else if (this.template_id == 13) {
+        this.$router.push({ path: "/dialysis/print/batch/thirteen" });
       }
     },
     batchPrintActionOne: function() {

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

@@ -60,6 +60,9 @@
         <el-radio v-model="receiveTreatmentAsses.condition" label="3"
           >手术期</el-radio
         >
+        <el-radio v-model="receiveTreatmentAsses.condition" label="4"
+          >急诊</el-radio
+        >
       </el-form-item>
 
       <el-form-item

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -160,6 +160,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 15">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
@@ -245,6 +255,10 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 13"
       ></DialysisPrintOrderThirteen>
+      <DialysisPrintOrderFifteen
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 15"
+      ></DialysisPrintOrderFifteen>
     </div>
   </div>
 </template>
@@ -269,10 +283,12 @@ import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
 import DialysisPrintOrderEleven from "./template/DialysisPrintOrderEleven";
 import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
 import DialysisPrintOrderThirteen from "./template/DialysisPrintOrderThirteen";
+import DialysisPrintOrderFifteen from "./template/DialysisPrintOrderFifteen";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+  DialysisPrintOrderFifteen,
     DialysisPrintOrderThirteen,
     DialysisPrintOrderTwelve,
     DialysisPrintOrderEleven,
@@ -508,6 +524,13 @@ export default {
           style: style3,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 15){
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -340,7 +340,7 @@
             <td width="50" style="text-align:left;border:none;">
               <div>
                 <span class="under_line" style="width:50px;display:inline-block">
-                  {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
+                  {{ afterdialysis.pulse_frequency ? afterdialysis.pulse_frequency : "" }}
                 </span>次/分
               </div>
             </td>

src/xt_pages/integration/his/patientHisConfig.vue

@@ -264,8 +264,8 @@
         }
         this.form.other_age = this.getAge(row)
         this.form.infectious = this.getInfectiousName(row)
-        console.log('111111')
-        console.log(this.getInfectiousName(row))
+       // console.log('111111')
+       // console.log(this.getInfectiousName(row))
 
         if (row.his_patient.id > 0) {
           this.his_record_id = row.his_patient.id

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,19 +293,157 @@ 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)
+      var now = new Date()
+      var nowMonth = now.getMonth(); //当前月
+      var nowYear = now.getFullYear(); //当前年
+      //本月的开始时间
+      var monthStartDate = new Date(nowYear, nowMonth, 1);
+      var timeStar=Date.parse(monthStartDate)/1000;//s
+     // console.log("本月第一天",timeStar)
+      //本月的结束时间
+      var monthEndDate = new Date(nowYear, nowMonth+1, 0);
+      var timeEnd=Date.parse(monthEndDate)/1000-1;//s
+     // console.log("本月最后一天",timeEnd)
+      //本月
+      if(state == 0){
+       //统计透析总量
+        this.getDialysisModeType(startDate,endDate)
+        //统计转归状态
+        this.getTotalLapseCount(timeStar,timeEnd)
+        //统计男女比例
+        this.getTotalSexCount(timeStar,timeEnd)
+        //统计传染病
+        this.getTotalInfectiousCount(timeStar,timeEnd)
+        //统计年龄
+        this.getTotalAgeCount(timeStar,timeEnd)
+        //统计透析年龄
+        this.getTotalDialysisCount(timeStar,timeEnd)
+      }
+      //近三月
+      if(state == 1){
+        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)
+      }
+
+     //近半年
+     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=>{
@@ -254,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)
-         
+
          }
       })
     },
@@ -361,7 +560,7 @@ export default {
             //   if(infectious[i].disease_id == 6){
             //     infectious[i].disease_id = "梅毒"
             //   }
-               
+
             // }
              var otherTotal = response.data.data.otherTotal
              this.otherTotal = otherTotal
@@ -378,7 +577,7 @@ export default {
           this.ageTotal =  response.data.data.total
          // var two = response.data.data.two
         //  console.log("two",two)
-       
+
          }
       })
     },
@@ -386,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)
-          
+
          }
       })
     }
@@ -410,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/checkStatistical.vue

@@ -108,7 +108,7 @@ import { GetOICData } from "@/api/qcd";
 import PieChart from "../qcd/components/BarChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import {getAllInspectionData,SaveCheckConfiguration,getAllCheckList,getCheckDetail,UpdateCheck,DeleteCheck} from "@/api/common/common"
+import {getAllInspectionData,SaveCheckConfiguration,getAllCheckList,getCheckDetail,UpdateCheck,DeleteCheck,getLastCheckList} from "@/api/common/common"
 export default {
   name: "dialysisTotal",
   data() {
@@ -147,7 +147,9 @@ export default {
   created() {
     //获取大项
     this.getAllInspectionData(),
-    this.getAllCheckList()
+    this.getAllCheckList(),
+    //获取排序
+    this.getLastCheckList()
   },
   methods: {
     handleTabClick(tab, event) {
@@ -160,7 +162,7 @@ export default {
        getCheckDetail(id).then(response=>{
          if(response.data.state == 1){
            var checkdetail = response.data.data.checkdetail
-           console.log("checkdetail",checkdetail)
+          // console.log("checkdetail",checkdetail)
            this.editform.id = checkdetail.id
            this.editform.inspectionMajor = checkdetail.inspection_major
            this.editform.frequency = checkdetail.inspection_frequency
@@ -193,9 +195,12 @@ export default {
                 this.form.inspectionMajor = ""
                 this.form.frequency = ""
                 this.form.sort = ""
+                this.getAllCheckList()
+                this.getLastCheckList()
               }else{
                 this.$message.error("检验检查项已存在,不能重复添加")
               }
+              
            })
          }
        })
@@ -217,10 +222,10 @@ export default {
               checklist[i].sort = ""
             }
           }
-          console.log("列表",checklist)
+         // console.log("列表",checklist)
           this.checkList = checklist
           this.total = response.data.data.total
-          console.log("total",this.total)
+          //console.log("total",this.total)
         }
       })
     },
@@ -264,11 +269,19 @@ export default {
         DeleteCheck(id,index).then(response => {
           if (response.data.state === 1) {
            var msg =  response.data.data.msg
-           console.log("msg",msg)
+           //console.log("msg",msg)
            this.checkList.splice(index,1)
           }
         });
       });
+    },
+    getLastCheckList(){
+      getLastCheckList().then(response=>{
+         if(response.data.state === 1){
+          var checklist =  response.data.data.checkList
+          this.form.sort = checklist.sort+1+""
+         }
+      })
     }
   },
   components: {

src/xt_pages/qcd/components/LineChart.vue

@@ -79,15 +79,22 @@ export default {
     this.chart = null;
   },
   watch: {
-    options: function() {
-      this.chartOptions = this.options;
-      this.initChart();
-      this.__resizeHanlder = debounce(() => {
-        if (this.chart) {
-          this.chart.resize();
-        }
-      }, 100);
-      window.addEventListener("resize", this.__resizeHanlder);
+    // options: function(a) {
+    //   console.log(a)
+    //   this.chartOptions = this.options;
+    //   this.initChart();
+    //   this.__resizeHanlder = debounce(() => {
+    //     if (this.chart) {
+    //       this.chart.resize();
+    //     }
+    //   }, 100);
+    //   window.addEventListener("resize", this.__resizeHanlder);
+    // },
+    options:{
+      handler(newValue,oldValue){
+        this.getInitChart();
+      },
+      deep:true
     },
 
     chartData: {
@@ -99,9 +106,19 @@ export default {
   },
   created() {
     this.chartOptions = this.options;
-    console.log("this.chartOptions", this.chartOptions, this.options);
+    // console.log("this.chartOptions", this.chartOptions, this.options);
   },
   methods: {
+    getInitChart() {
+      this.chartOptions = this.options;
+      this.initChart();
+      this.__resizeHanlder = debounce(() => {
+        if (this.chart) {
+          this.chart.resize();
+        }
+      }, 100);
+      window.addEventListener("resize", this.__resizeHanlder);
+    },
     // setOptions({ expectedData, actualData } = {}) {
     //   this.chart.setOption({
     //     title: {
@@ -152,7 +169,7 @@ export default {
           },
           axisLine: {
             lineStyle: {
-              color: "pink" //x轴颜色
+              color: "#E5E5E5" //x轴颜色
             }
           },
           axisLabel: {
@@ -176,6 +193,9 @@ export default {
               } else {
                 return value;
               }
+            },
+            textStyle: {
+              color:"#2F3133"
             }
           }
         },
@@ -199,7 +219,12 @@ export default {
           },
           axisLine: {
             lineStyle: {
-              color: "pink" //y轴颜色
+              color: "#E5E5E5" //y轴颜色
+            },
+          },
+          axisLabel: {
+            textStyle: {
+              color:"#2F3133"
             }
           }
         },

src/xt_pages/qcd/dialysisTotal.vue

@@ -146,8 +146,8 @@
         align="right"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :current-page="listQuery.pate"
-        :page-sizes="[10, 20, 50, 100]"
+        :current-page="listQuery.page"
+        :page-sizes="[20, 40, 60,80, 100]"
         :page-size="10"
         background
         style="margin-top:20px;"

src/xt_pages/qcd/indicatorControlAnalysis/analysisDetails.vue

@@ -16,7 +16,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <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>

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -4,33 +4,48 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
-      <div class="page_bloodPressure">
+      <div class="page_process">
         <new-nav activeName="bloodPressure"></new-nav>
         <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-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"
+            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -38,10 +53,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="选择日期时间"
@@ -53,39 +69,88 @@
         <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" :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>
-            </div>
-            <div class="cell clearfix" style="margin:0;margin-bottom:10px">
-              <div class="tableTitle">统计表</div>
+              <line-chart :options="bar"></line-chart>
+
             </div>
+            <div class="tableTitle">统计表</div>
             <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-column label="操作" width="100">
+              <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">
+                    {{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>
+                    {{scope.row.patient.lapseto == 1 ? '留治':'转出'}}
                   </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-column fixed="right" label="趋势" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      @click.native.prevent="jumpDetail(scope.row.patient.id)"
+                      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"
+                :current-page="query.page"
                 :page-sizes="[10, 20, 50, 100]"
                 :page-size="10"
                 background
@@ -103,264 +168,392 @@
 
 
 <script>
-import echarts from "echarts";
-import NewNav from "../indicatorControlAnalysis/components/NewNav";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import LineChart from "../../qcd/components/LineChart";
-export default {
-  components: {
-    LineChart,
-    BreadCrumb,
-    NewNav
-  },
-  data() {
-    return {
-      crumbs: [
-        { path: false, name: "科室质控" },
-        { path: false, name: "指标评估统计" },
-        { path: false, name: "患者血压统计" }
-      ],
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
-      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
-        }
-      ],
-      chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
+  import echarts from 'echarts'
+  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 {GetDialysisBloodPressureChartData,GetDialysisBloodPressureTableData} from "@/api/common/statistics"
+
+  import {
+    PostSearch
+  } from '@/api/patient'
+
+  import { uParseTime } from "@/utils/tools";
+  import { getDataConfig } from "@/utils/data";
+
+  export default {
+    components: {
+      LineChart,
+      BreadCrumb,
+      NewNav
+    },
+    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;;
+          }
         },
-        xAxis: {
-          data: ["达标", "未达标"]
+        patientsData:[],
+        tableData: [
+        ],
+        loading: false,
+        search_value: '',
+        total: '',
+        query: {
+          patient_id: '',
+          statistics_type: 1,
+          start_time: '',
+          end_time: '',
+          limit: 10,
+          page: 1
         },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+        options: [
+          { value: 1, name: '不限' },
+          { value: 2, name: '透前血压' },
+          { value: 3, name: '透后血压' },
+        ],
+        crumbs: [
+          { path: false, name: '科室质控' },
+          { path: false, name: '指标评估统计' },
+          { path: false, name: '透析过程指标统计' }
+        ],
+        tableData1: [],
+        chart: {
+          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;
-                  }
-
-                  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] }
-                  ]);
+            show: false
+          },
+          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] //柱状角成椭圆形
                 },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
+
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        },
+        bar: {
+          title: {
+            text: 'ECharts 入门示例'
+          },
+          tooltip: {},
+          legend: {
+            data: [],
+            left: 0
+          },
+          xAxis: {
+            data: []
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
+            },
+            show: false
+          },
+          series: [
+            {
+              name: '',
+              type: 'bar',
+              data: [],
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: 'top',
+                  formatter: '{c}次'
+                }
               },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
+
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: function(params) {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = [
+                      ['#A9E0F3', '#9FBDFC'],
+                      ['#FFD7C0', '#FF9994']
+                    ]
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                    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)'
+                }
               }
             }
-          }
-        ]
+          ]
+        }
+
       }
-    };
-  },
-  methods: {
-    chooseWay(way) {
-      this.wayType = way;
     },
-    handleClick(row) {
-      console.log(row);
-      this.$router.push({
-        path: "/qcd/indicatorControlAnalysis/bloodPressureDetails"
-      });
+    methods: {
+      changeProject(val){
+        this.query.statistics_type = val
+        this.query.page = 1
+        this.GetDialysisBloodPressureChartData(this.query)
+
+      },
+      handleChange(val){
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetDialysisBloodPressureTableData(this.query)
+        this.GetDialysisBloodPressureChartData(this.query)
+      },
+      handleSizeChange(limit) {
+        this.query.limit = limit;
+
+      },
+      handleCurrentChange(page) {
+        this.query.page = page;
+
+      },
+      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;
+      },
+      QueryOperaById: function(val) {
+        let vascular_access_desc_name = "";
+        let vascular_access_desc = getDataConfig(
+          "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;
+          }
+        }
+
+        return vascular_access_desc_name;
+      },
+      GetAnticoagulantById: function (val) {
+        let anticoagulan_name = ''
+        var anticoagulantsConfitTwo = this.$store.getters.anticoagulants_confit
+        let anticoagulant = anticoagulantsConfitTwo
+        for (let keys in anticoagulant) {
+          if (anticoagulant[keys].id == val) {
+            anticoagulan_name = anticoagulant[keys].name
+          }
+        }
+        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() {
+
+
+      }, 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])
+              }
+            } else {
+              this.loading = false
+            }
+          })
+          .catch(error => {
+
+          })
+      },
+      GetDialysisBloodPressureChartData(params) {
+        this.bar.xAxis.data = []
+        this.bar.series[0].data = []
+        GetDialysisBloodPressureChartData(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].name)
+                  this.bar.series[0].data.push(resp.data.data[i].total)
+              }
+            } else {
+            }
+          })
+          .catch(error => {
+          })
+      },
+      handleSelect(val) {
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetDialysisBloodPressureChartData(this.query)
+        this.GetDialysisBloodPressureTableData(this.query)
+
+      },
+      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([])
+          }
+        })
+      },
+      chooseWay(way) {
+        this.wayType = way
+      }, getCurrentOrgPatients(){
+        getCurrentOrgPatients().then(response=>{
+          if(response.data.state == 1){
+            var patients = response.data.data.patients
+            this.patientsData = patients
+          }
+        })
+      },
+    }, 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 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.GetDialysisBloodPressureChartData(this.query)
+      this.GetDialysisBloodPressureTableData(this.query)
+      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_bloodPressure {
+  .page_process {
+
   .el-button--medium {
     padding: 10px 8px;
   }
+
   .el-form-item {
     margin-bottom: 0;
   }
-  .cell {
-    text-align: center;
+
   }
-}
 </style>

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -16,7 +16,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <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>
@@ -74,7 +74,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border>
+              <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>
@@ -238,9 +238,9 @@ export default {
             //配置样式
             itemStyle: {
               normal: {
-                color: "#dd7383", //折点颜色
+                color: "#f56c6c", //折点颜色
                 lineStyle: {
-                  color: "#dd7383" //折线颜色
+                  color: "#f56c6c" //折线颜色
                 }
               }
             }

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

@@ -78,7 +78,7 @@
     </div>
     <div class="tableTitle">统计表</div>
     <div>
-      <el-table :data="tableData" style="width: 100%" border>
+      <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>

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

@@ -81,7 +81,7 @@
     <el-container>
       <div style="width:150px">
         <div class="tableTitle">患者列表</div>
-        <el-table :data="tableData" border style="width: 100%;" height="500">
+        <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>

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -4,33 +4,48 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
-      <div class="page_monitor">
+      <div class="page_process">
         <new-nav activeName="monitor"></new-nav>
         <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-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"
+            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -38,10 +53,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="选择日期时间"
@@ -53,9 +69,16 @@
         <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" :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">
@@ -65,20 +88,96 @@
             </div>
             <div class="tableTitle">统计表</div>
             <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="tableData" style="width: 100%" :height="tableHeight" v-loading="loading">
+                <el-table-column fixed label="监测时间" align="center">
+                  <template slot-scope="scope">
+                    <!--{{getTime(scope.row.operate_time)}}-->
+                    {{scope.row.operate_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
+
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="收缩压" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.systolic_blood_pressure?scope.row.systolic_blood_pressure:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="舒张压" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.diastolic_blood_pressure?scope.row.diastolic_blood_pressure:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="脉搏" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.pulse_frequency?scope.row.pulse_frequency:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="呼吸" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.breathing_rate?scope.row.breathing_rate:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="体温" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.temperature?scope.row.temperature:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="血流量" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.blood_flow_volume?scope.row.blood_flow_volume:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="静脉压" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.venous_pressure?scope.row.venous_pressure:''}}
+                  </template>
+                </el-table-column>
+
+
+                <el-table-column label="动脉压" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.arterial_pressure?scope.row.arterial_pressure:''}}
+
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="跨膜压" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.transmembrane_pressure?scope.row.transmembrane_pressure:''}}
+                  </template>
+                </el-table-column>
+
+
+                <el-table-column label="透析液温度" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.dialysate_temperature?scope.row.dialysate_temperature:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="超滤率" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.ultrafiltration_rate?scope.row.ultrafiltration_rate:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="超滤量" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.ultrafiltration_volume?scope.row.ultrafiltration_volume:''}}
+                  </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
@@ -96,255 +195,412 @@
 
 
 <script>
-import echarts from "echarts";
-import NewNav from "../indicatorControlAnalysis/components/NewNav";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import LineChart from "../../qcd/components/LineChart";
-export default {
-  components: {
-    LineChart,
-    BreadCrumb,
-    NewNav
-  },
-  data() {
-    return {
-      crumbs: [
-        { path: false, name: "科室质控" },
-        { path: false, name: "指标评估统计" },
-        { path: false, name: "透析监测信息统计" }
-      ],
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
-      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
-        }
-      ],
-      chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
+  import echarts from 'echarts'
+  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 {
+    GetDefalutPatient,
+    GetDialysisWatchChartData,
+    GetDialysisWatchTableData
+  } from '@/api/common/statistics'
+
+
+  import {
+    PostSearch
+  } from '@/api/patient'
+
+  import { uParseTime } from "@/utils/tools";
+  import { getDataConfig } from "@/utils/data";
+
+  export default {
+    components: {
+      LineChart,
+      BreadCrumb,
+      NewNav
+    },
+    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;;
+          }
         },
-        xAxis: {
-          data: ["达标", "未达标"]
+        patientsData:[],
+        tableData: [
+        ],
+        loading: false,
+        search_value: '',
+        total: '',
+        query: {
+          patient_id: '',
+          statistics_type: 1,
+          start_time: '',
+          end_time: '',
+          limit: 10,
+          page: 1
         },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+        options: [
+          { value: 1, name: '收缩压' },
+          { value: 2, name: '舒张压' },
+          { value: 3, name: '脉搏' },
+          { value: 4, name: '呼吸' },
+          { value: 5, name: '体温' },
+          { value: 6, name: '血流量' },
+          { value: 7, name: '静脉压' },
+          { value: 8, name: '动脉压' },
+          { value: 9, name: '跨膜压' },
+          { value: 10, name: '透析液温度' },
+          { value: 11, name: '超滤率' },
+          { value: 12, name: '超滤量' },
+        ],
+        crumbs: [
+          { path: false, name: '科室质控' },
+          { path: false, name: '指标评估统计' },
+          { path: false, name: '透析过程指标统计' }
+        ],
+        tableData: [],
+        tableData1: [],
+        chart: {
+          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: []
+          },
+          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;
-                  }
-
-                  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] }
-                  ]);
+            show: false
+          },
+          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] //柱状角成椭圆形
                 },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
+
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        },
+        bar: {
+          title: {
+            text: 'ECharts 入门示例'
+          },
+          tooltip: {},
+          legend: {
+            data: [],
+            left: 0
+          },
+          xAxis: {
+            data: []
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
+            },
+            show: false
+          },
+          series: [
+            {
+              name: '',
+              type: 'bar',
+              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
+                    }
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                    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)'
+                }
               }
             }
-          }
-        ]
+          ]
+        }
+
       }
-    };
-  },
-  methods: {
-    chooseWay(way) {
-      this.wayType = way;
+    },
+    methods: {
+      changeProject(val){
+        this.query.statistics_type = val
+        this.query.page = 1
+        this.GetDialysisWatchChartData(this.query)
+
+      },
+      handleChange(val){
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetDialysisWatchTableData(this.query)
+        this.GetDialysisWatchChartData(this.query)
+      },
+      handleSizeChange(limit) {
+        this.query.limit = limit;
+
+      },
+      handleCurrentChange(page) {
+        this.query.page = page;
+
+      },
+      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.GetDialysisWatchChartData(this.query)
+          this.GetDialysisWatchTableData(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.GetDialysisWatchChartData(this.query)
+          this.GetDialysisWatchTableData(this.query)
+
+        }
+      },
+      getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000;
+      },
+      QueryOperaById: function(val) {
+        let vascular_access_desc_name = "";
+        let vascular_access_desc = getDataConfig(
+          "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;
+          }
+        }
+
+        return vascular_access_desc_name;
+      },
+      GetAnticoagulantById: function (val) {
+        let anticoagulan_name = ''
+        var anticoagulantsConfitTwo = this.$store.getters.anticoagulants_confit
+        let anticoagulant = anticoagulantsConfitTwo
+        for (let keys in anticoagulant) {
+          if (anticoagulant[keys].id == val) {
+            anticoagulan_name = anticoagulant[keys].name
+          }
+        }
+        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() {
+
+
+      }, GetDialysisWatchTableData(params) {
+        this.loading = true
+        this.tableData = []
+        GetDialysisWatchTableData(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 => {
+          })
+      },
+      GetDialysisWatchChartData(params) {
+        this.chart.xAxis.data = []
+        this.chart.series[0].data = []
+        this.bar.xAxis.data = []
+        this.bar.series[0].data = []
+        GetDialysisWatchChartData(params)
+          .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 {
+            }
+          })
+          .catch(error => {
+          })
+      },
+      handleSelect(val) {
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetDialysisWatchTableData(this.query)
+        this.GetDialysisWatchChartData(this.query)
+
+      },
+      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([])
+          }
+        })
+      },
+      chooseWay(way) {
+        this.wayType = way
+      }, getCurrentOrgPatients(){
+        getCurrentOrgPatients().then(response=>{
+          if(response.data.state == 1){
+            var patients = response.data.data.patients
+            this.patientsData = patients
+          }
+        })
+      },
+    }, 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 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.GetDialysisWatchChartData(this.query)
+      this.GetDialysisWatchTableData(this.query)
+      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_monitor {
+  .page_process {
+
   .el-button--medium {
     padding: 10px 8px;
   }
+
   .el-form-item {
     margin-bottom: 0;
   }
-}
+
+  }
 </style>

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -7,7 +7,7 @@
       <div class="page_process">
         <new-nav activeName="process"></new-nav>
         <div class="cell clearfix">
-          <el-form :inline="true" :model="listQuery">
+          <el-form :inline="true">
             <el-form-item label>
               <el-autocomplete
                 class="checkSearch"
@@ -26,12 +26,13 @@
 
             </el-form-item>
           </el-form>
-          <el-select v-model="query.statistics_type" placeholder="请选择" 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.name"
               :value="item.value"
+
             ></el-option>
           </el-select>
           <label class="title">
@@ -44,6 +45,7 @@
             :editable="false"
             style="width: 150px;"
             type="date"
+            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -55,6 +57,7 @@
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
+            :picker-options="pickerOptions"
             style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
@@ -66,31 +69,174 @@
         <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="100">
-
-
+            <el-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="100">
-
-
+              <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="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="tableData1" style="width: 100%" border v-loading="loading">
-                <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"  :height="tableHeight"   v-loading="loading">
+                <el-table-column  fixed label="透析日期" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.schedule_date | parseTime("{y}-{m}-{d}") }}
+                    <!--{{getTime(scope.row.schedule_date)}}-->
+                  </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.device_number.number}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="干体重" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.predialysis_evaluation.dry_weight?scope.row.predialysis_evaluation.dry_weight:''}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="透前体重" align="center">
+                  <template slot-scope="scope">
+                    {{ 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 :''}}
+
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="目标超滤量" align="center">
+                  <template slot-scope="scope">
+                    {{ 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 :''}}
+
+                  </template>
+                </el-table-column>
+
+
+                <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>
+
+
+                  </template>
+                </el-table-column>
+
+                <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>
+
+
+                  </template>
+                </el-table-column>
+
+
+                <el-table-column label="透前脉率" align="center">
+                  <template slot-scope="scope">
+                    {{ 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:''}}
+
+                  </template>
+                </el-table-column>
+
+
+                <el-table-column label="透析模式" align="center">
+                  <template slot-scope="scope">
+                    {{ getModeName(scope.row.prescription.mode_id)}}
+                  </template>
+                </el-table-column>
+
+
+                <el-table-column label="透析器" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.prescription.dialyzer_perfusion_apparatus}}
+                  </template>
+                </el-table-column>
+
+
+                <el-table-column label="钾" align="center">
+                  <template slot-scope="scope">
+                    {{ 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:""}}
+
+                  </template>
+                </el-table-column>
+
+
+                <el-table-column label="钙" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.prescription.calcium?scope.row.prescription.calcium:""}}
+
+                  </template>
+                </el-table-column>
+
+
+                <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+'分钟':''}}
+                  </template>
+
+                </el-table-column>
+
+                <el-table-column label="血管通路" align="center">
+                  <template slot-scope="scope">
+                    {{ QueryOperaById(scope.row.predialysis_evaluation.blood_access_part_opera_id)}}
+                  </template>
+                </el-table-column>
+
+
+                <el-table-column label="抗凝剂" align="center">
+                  <template slot-scope="scope">
+                    {{GetAnticoagulantById( scope.row.prescription.anticoagulant)}}
+                  </template>
+                </el-table-column>
+
               </el-table>
 
               <el-pagination
@@ -119,12 +265,22 @@
   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 {
     GetDefalutPatient,
     GetDialysisProcessIndexChartData,
     GetDialysisProcessIndexTableData
   } from '@/api/common/statistics'
 
+
+
+  import {
+    PostSearch
+  } from '@/api/patient'
+
+  import { uParseTime } from "@/utils/tools";
+  import { getDataConfig } from "@/utils/data";
+
   export default {
     components: {
       LineChart,
@@ -133,6 +289,15 @@
     },
     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: '',
@@ -191,7 +356,7 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}次'
+                  formatter: '{c}'
                 }
               },
               //配置样式
@@ -304,10 +469,95 @@
       }
     },
     methods: {
+      jumpDetail(patient_id){
+        this.$router.push("/dqc/bloodpressure/detail?id="+patient_id)
+
+      },
+      changeProject(val){
+        this.query.statistics_type = val
+        this.query.page = 1
+        this.GetDialysisProcessIndexChartData(this.query)
+        // this.GetDialysisProcessIndexTableData(this.query)
+
+      },
+      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;
+
+      },
+      handleCurrentChange(page) {
+        this.query.page = page;
+
+      },
+      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.GetDialysisProcessIndexChartData(this.query)
+          this.GetDialysisProcessIndexTableData(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.GetDialysisProcessIndexChartData(this.query)
+          this.GetDialysisProcessIndexTableData(this.query)
+
+        }
+      },
+      getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000;
+      },
+      QueryOperaById: function(val) {
+        let vascular_access_desc_name = "";
+        let vascular_access_desc = getDataConfig(
+          "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;
+          }
+        }
+
+        return vascular_access_desc_name;
+      },
+      GetAnticoagulantById: function (val) {
+        let anticoagulan_name = ''
+        var anticoagulantsConfitTwo = this.$store.getters.anticoagulants_confit
+        let anticoagulant = anticoagulantsConfitTwo
+        for (let keys in anticoagulant) {
+          if (anticoagulant[keys].id == val) {
+            anticoagulan_name = anticoagulant[keys].name
+          }
+        }
+        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() {
 
+
       }, GetDialysisProcessIndexTableData(params) {
         this.loading = true
         this.tableData = []
@@ -343,6 +593,9 @@
                   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)
@@ -359,6 +612,7 @@
         this.query.page = 1
         this.GetDialysisProcessIndexChartData(this.query)
         this.GetDialysisProcessIndexTableData(this.query)
+
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -377,7 +631,14 @@
       },
       chooseWay(way) {
         this.wayType = way
-      }
+      }, getCurrentOrgPatients(){
+        getCurrentOrgPatients().then(response=>{
+          if(response.data.state == 1){
+            var patients = response.data.data.patients
+            this.patientsData = patients
+          }
+        })
+      },
     }, created() {
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
@@ -390,6 +651,8 @@
       this.query.statistics_type = 1
       this.GetDialysisProcessIndexChartData(this.query)
       this.GetDialysisProcessIndexTableData(this.query)
+      this.getCurrentOrgPatients()
+
 
     }
   }

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -4,33 +4,48 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
-      <div class="page_weight">
+      <div class="page_process">
         <new-nav activeName="weight"></new-nav>
         <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-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"
+            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -38,10 +53,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="选择日期时间"
@@ -53,37 +69,99 @@
         <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" :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="bar"></line-chart>
+
             </div>
             <div class="tableTitle">统计表</div>
             <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-column label="操作" width="100">
+
+              <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">
-                    <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+                    <!--<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}}</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-column fixed="right" label="趋势" align="center">
+                  <template slot-scope="scope">
+                    <el-button
+                      @click.native.prevent="jumpDetail(scope.row.patient_id)"
+                      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"
+                :current-page="query.page"
                 :page-sizes="[10, 20, 50, 100]"
                 :page-size="10"
                 background
@@ -101,264 +179,392 @@
 
 
 <script>
-import echarts from "echarts";
-import NewNav from "../indicatorControlAnalysis/components/NewNav";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import LineChart from "../../qcd/components/LineChart";
-export default {
-  components: {
-    LineChart,
-    BreadCrumb,
-    NewNav
-  },
-  data() {
-    return {
-      crumbs: [
-        { path: false, name: "科室质控" },
-        { path: false, name: "指标评估统计" },
-        { path: false, name: "患者血压统计" }
-      ],
-      listQuery: {
-        start_time: "",
-        end_time: "",
-        page: 1,
-        limit: 10
-      },
-      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
-        }
-      ],
-      chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
-        tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
+  import echarts from 'echarts'
+  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 {GetDialysisWeightChartData,GetDialysisWeightTableData} from "@/api/common/statistics"
+
+  import {
+    PostSearch
+  } from '@/api/patient'
+
+  import { uParseTime } from "@/utils/tools";
+  import { getDataConfig } from "@/utils/data";
+
+  export default {
+    components: {
+      LineChart,
+      BreadCrumb,
+      NewNav
+    },
+    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;;
+          }
         },
-        xAxis: {
-          data: ["达标", "未达标"]
+        patientsData:[],
+        tableData: [
+        ],
+        loading: false,
+        search_value: '',
+        total: '',
+        query: {
+          patient_id: '',
+          statistics_type: 1,
+          start_time: '',
+          end_time: '',
+          limit: 10,
+          page: 1
         },
-        yAxis: {
-          axisLabel: {
-            formatter: "{value} %"
+        options: [
+          { value: 1, name: '干体重' },
+          { value: 2, name: '透前体重' },
+          { value: 3, name: '体重增加' },
+          { value: 4, name: '透后体重' },
+        ],
+        crumbs: [
+          { path: false, name: '科室质控' },
+          { path: false, name: '指标评估统计' },
+          { path: false, name: '透析过程指标统计' }
+        ],
+        tableData1: [],
+        chart: {
+          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;
-                  }
-
-                  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] }
-                  ]);
+            show: false
+          },
+          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] //柱状角成椭圆形
                 },
-                barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
+
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        },
+        bar: {
+          title: {
+            text: 'ECharts 入门示例'
+          },
+          tooltip: {},
+          legend: {
+            data: [],
+            left: 0
+          },
+          xAxis: {
+            data: []
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
+            },
+            show: false
+          },
+          series: [
+            {
+              name: '',
+              type: 'bar',
+              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
+                    }
 
-              //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                    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)'
+                }
               }
             }
-          }
-        ]
+          ]
+        }
+
       }
-    };
-  },
-  methods: {
-    chooseWay(way) {
-      this.wayType = way;
     },
-    handleClick(row) {
-      console.log(row);
-      this.$router.push({
-        path: "/qcd/indicatorControlAnalysis/weightDetails"
-      });
+    methods: {
+      changeProject(val){
+        this.query.statistics_type = val
+        this.query.page = 1
+        this.GetDialysisWeightChartData(this.query)
+
+      },
+      handleChange(val){
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetDialysisWeightTableData(this.query)
+        this.GetDialysisWeightChartData(this.query)
+      },
+      handleSizeChange(limit) {
+        this.query.limit = limit;
+
+      },
+      handleCurrentChange(page) {
+        this.query.page = page;
+
+      },
+      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.GetDialysisWeightChartData(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.GetDialysisWeightChartData(this.query)
+          this.GetDialysisWeightTableData(this.query)
+
+        }
+      },
+      getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000;
+      },
+      QueryOperaById: function(val) {
+        let vascular_access_desc_name = "";
+        let vascular_access_desc = getDataConfig(
+          "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;
+          }
+        }
+
+        return vascular_access_desc_name;
+      },
+      GetAnticoagulantById: function (val) {
+        let anticoagulan_name = ''
+        var anticoagulantsConfitTwo = this.$store.getters.anticoagulants_confit
+        let anticoagulant = anticoagulantsConfitTwo
+        for (let keys in anticoagulant) {
+          if (anticoagulant[keys].id == val) {
+            anticoagulan_name = anticoagulant[keys].name
+          }
+        }
+        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() {
+
+
+      }, GetDialysisWeightTableData(params) {
+        this.loading = true
+        this.tableData = []
+        GetDialysisWeightTableData(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 => {
+
+          })
+      },
+      GetDialysisWeightChartData(params) {
+        this.bar.xAxis.data = []
+        this.bar.series[0].data = []
+        GetDialysisWeightChartData(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].name)
+                this.bar.series[0].data.push(resp.data.data[i].total)
+              }
+            } else {
+            }
+          })
+          .catch(error => {
+          })
+      },
+      handleSelect(val) {
+        this.query.patient_id = val.id
+        this.query.page = 1
+        this.GetDialysisWeightChartData(this.query)
+        this.GetDialysisWeightTableData(this.query)
+
+      },
+      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([])
+          }
+        })
+      },
+      chooseWay(way) {
+        this.wayType = way
+      }, getCurrentOrgPatients(){
+        getCurrentOrgPatients().then(response=>{
+          if(response.data.state == 1){
+            var patients = response.data.data.patients
+            this.patientsData = patients
+          }
+        })
+      },
+    }, 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 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.GetDialysisWeightChartData(this.query)
+      this.GetDialysisWeightTableData(this.query)
+      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_weight {
+  .page_process {
+
   .el-button--medium {
     padding: 10px 8px;
   }
+
   .el-form-item {
     margin-bottom: 0;
   }
-  .cell {
-    text-align: center;
+
   }
-}
 </style>

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -16,7 +16,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <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>
@@ -74,7 +74,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border>
+              <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>

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -9,7 +9,7 @@
         <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="lapseto" placeholder="请选择" style="width:120px;margin-right:20px" @change="changeOptions">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -25,12 +25,12 @@
             :value="item.value"
           ></el-option>
         </el-select>
-        <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
+        <el-select v-model="mode_type" placeholder="请选择" style="width:120px;margin-right:20px" @change="handleModeType">
           <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            v-for="item in normdata"
+            :key="item.inspection_minor"
+            :label="item.item_name"
+            :value="item.inspection_minor"
           ></el-option>
         </el-select>
       </div>
@@ -46,35 +46,20 @@
         <p class="pointTitle">指标正常范围值</p>
       </div>
       <div class="cell clearfix newDisplay">
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
+        <span class="index" v-for="(item,index) in normdata" :key="index ">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+const moment = require('moment')
 import echarts from "echarts";
 import { GetOICData } from "@/api/qcd";
 import LineChart from "../../qcd/components/LineChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {getNormData,getProjectList,getMonthProjectList } from "@/api/common/common"
 export default {
   components: {
     LineChart,
@@ -83,6 +68,11 @@ export default {
   data() {
     return {
       activeName: "second",
+      normdata:[],
+      modesData: {
+        xAxis: [],
+        series: []
+      },
       crumbs: [
         { path: false, name: "科室质控" },
         { path: false, name: "科室质控达标统计" },
@@ -90,38 +80,32 @@ export default {
       ],
       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: "请选项",
       options1: [
         {
-          value: "按季度对比统计",
+          value: 1,
           label: "按季度对比统计"
         },
         {
-          value: "按月份对比统计",
+          value: 2,
           label: "按月份对比统计"
-        }
+        },
       ],
-      type: "按季度对比统计",
+      value: "请选项",
+      lapseto:0,
+      type:1,
+      mode_type:"",
       chart: {
         title: {
           text: "ECharts 入门示例"
@@ -143,7 +127,7 @@ export default {
         series: [
           {
             name: "次数",
-            type: "line",
+            type: "bar",
             data: [
               "78.57",
               "50",
@@ -160,7 +144,7 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}%"
               }
             },
             //配置样式
@@ -217,10 +201,552 @@ export default {
       }
     },
     chooseType(val) {
-      console.log(val);
       this.type = val;
+      console.log("val",val)
+      //按季度
+      if(val == 1){
+        this.getlist()
+      }
+      //按月份
+      if(val == 2){
+        this.getMonthList()
+      }
+     
+    },
+    changeOptions(val){
+     if(this.type == 2){
+        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
+      }
+      this.mode_type = val
+      this.getlist()
+     
+    },
+
+    //季度
+    getlist(){
+         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 params = {
+           lapseto:this.lapseto,
+           itemtype:this.type,
+           modetype:this.mode_type,
+           startime:firstQuarterStart,
+           endtime:firstQuarterEnd,
+           first_quarter_start:first_quarter_start,
+           first_qurter_end:first_qurter_end,
+           second_qurter_start:second_qurter_start,
+           second_qurter_end:second_qurter_end,
+           three_qurter_start:three_qurter_start,
+           three_qurter_end:three_qurter_end,
+           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},
+            {Total:"第三季度",Count:1,NoCount: 0},
+            {Total:"第四季度",Count:1,NoCount: 0},
+          ]
+    
+
+        //获取2个数组不同的部分
+        var arrTwo = this.arrayDate(list,newArr)
+        arrTwo.map(item => {
+              list.push(item)
+           })
+        //  console.log("list",list)
+         
+         for(let i=0;i<list.length;i++){
+            if(list[i].Total == "第一季度"){
+               list[i].Total = 1
+            }
+          if(list[i].Total == "第二季度"){
+               list[i].Total = 2
+           }
+         if(list[i].Total == "第三季度"){
+               list[i].Total = 3
+           }
+          if(list[i].Total == "第四季度"){
+               list[i].Total = 4
+           }
+         }
+          //排序
+          list.sort(this.compare('Total'))
+          for(let i=0;i<list.length;i++){
+            if(list[i].Total == 1){
+               list[i].Total = "第一季度"
+            }
+            if(list[i].Total == 2){
+               list[i].Total = "第二季度"
+            }
+            if(list[i].Total == 3){
+               list[i].Total = "第三季度"
+            }
+            if(list[i].Total == 4){
+               list[i].Total = "第四季度"
+            }
+          }
+
+           var newArrThree = [
+            {Total:"第一季度",Count:0},
+            {Total:"第二季度",Count:0},
+            {Total:"第三季度",Count:0},
+            {Total:"第四季度",Count:0},
+          ]
+
+           //获取2个数组不同的部分
+          var standArr = this.arrayDateTwo(standList,newArrThree)  
+          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++){
+                if(list[i].Total == standList[j].Total){
+                    list[i].NoCount = standList[j].Count
+                    arrFive.push(list[i])
+                }
+             }
+          }
+        
+       // console.log("arrFive",arrFive)
+        
+        for(const key in arrFive){
+            this.modesData.xAxis.push(arrFive[key].Total);
+            this.modesData.series.push(((arrFive[key].NoCount/arrFive[key].Count)*100).toFixed(1));
+          }
+         
+
+          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 = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.Total;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.Total;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                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 = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.Total;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.Total;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                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 = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.Total;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.Total;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                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 = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.Total;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.Total;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                result.push(obj);
+            }
+        }
+      //  console.log("resultTwo",result)
+        return result;
+    },
+     compare(property){
+       return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
+        }
+    },
+    
+    //按月份统计
+    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  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,
+          itemtype:this.type,
+          modetype:this.mode_type,
+          januaryStart:januaryStart,
+          januaryEnd:januaryEnd,
+          febStart:febStart,
+          febEnd:febEnd,
+          marchStart:marchStart,
+          marchEnd:marchEnd,
+          aprStart:aprStart,
+          aprEnd:aprEnd,
+          mayStart:mayStart,
+          mayEnd:mayEnd,
+          junStart:junStart,
+          junEnd:junEnd,
+          julStart:julStart,
+          julEnd:julEnd,
+          augStart:augStart,
+          augEnd:augEnd,
+          sepStart:sepStart,
+          sepEnd:sepEnd,
+          octStart:octStart,
+          octEnd:octEnd,
+          novStart:novStart,
+          novEnd:novEnd,
+          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},
+              {Total:"三月",Count:1,NoCount: 0},
+              {Total:"四月",Count:1,NoCount: 0},
+              {Total:"五月",Count:1,NoCount: 0},
+              {Total:"六月",Count:1,NoCount: 0},
+              {Total:"七月",Count:1,NoCount: 0},
+              {Total:"八月",Count:1,NoCount: 0},
+              {Total:"九月",Count:1,NoCount: 0},
+              {Total:"十月",Count:1,NoCount: 0},
+              {Total:"十一月",Count:1,NoCount: 0},
+              {Total:"十二月",Count:1,NoCount: 0},
+            ]
+
+            var newArrTwo = [
+              {Total:"一月",Count:0},
+              {Total:"二月",Count:0},
+              {Total:"三月",Count:0},
+              {Total:"四月",Count:0},
+              {Total:"五月",Count:0},
+              {Total:"六月",Count:0},
+              {Total:"七月",Count:0},
+              {Total:"八月",Count:0},
+              {Total:"九月",Count:0},
+              {Total:"十月",Count:0},
+              {Total:"十一月",Count:0},
+              {Total:"十二月",Count:0},
+            ]
+           
+             //获取2个数组不同的部分
+            var standArr = this.arrayDateThree(monthlist,newArr)  
+            console.log("standArr",standArr)
+            standArr.map(item=>{
+                monthlist.push(item)
+              }) 
+            
+
+             //排序
+             for(let i=0;i<monthlist.length;i++){
+                if(monthlist[i].Total == "一月"){
+                   monthlist[i].Total = 1
+                }
+                if(monthlist[i].Total == "二月"){
+                   monthlist[i].Total = 2
+                }
+                if(monthlist[i].Total == "三月"){
+                   monthlist[i].Total = 3
+                }
+                if(monthlist[i].Total == "四月"){
+                   monthlist[i].Total = 4
+                }
+                if(monthlist[i].Total == "五月"){
+                   monthlist[i].Total = 5
+                }
+                if(monthlist[i].Total == "六月"){
+                   monthlist[i].Total = 6
+                }
+                if(monthlist[i].Total == "七月"){
+                   monthlist[i].Total = 7
+                }
+                if(monthlist[i].Total == "八月"){
+                   monthlist[i].Total = 8
+                }
+                if(monthlist[i].Total == "九月"){
+                   monthlist[i].Total = 9
+                }
+                if(monthlist[i].Total == "十月"){
+                   monthlist[i].Total = 10
+                }
+                if(monthlist[i].Total == "十一月"){
+                   monthlist[i].Total = 11
+                }
+                 if(monthlist[i].Total == "十二月"){
+                   monthlist[i].Total = 12
+                }
+             }
+            
+              //排序
+             monthlist.sort(this.compare('Total'))
+             for(let i=0;i<monthlist.length;i++){
+                if(monthlist[i].Total == 1){
+                  monthlist[i].Total = "一月"
+                }
+                if(monthlist[i].Total == 2){
+                  monthlist[i].Total = "二月"
+                }
+                 if(monthlist[i].Total == 3){
+                  monthlist[i].Total = "三月"
+                }
+                 if(monthlist[i].Total == 4){
+                  monthlist[i].Total = "四月"
+                }
+                 if(monthlist[i].Total == 5){
+                  monthlist[i].Total = "五月"
+                }
+                 if(monthlist[i].Total == 6){
+                  monthlist[i].Total = "六月"
+                }
+                 if(monthlist[i].Total == 7){
+                  monthlist[i].Total = "七月"
+                }
+                 if(monthlist[i].Total == 8){
+                  monthlist[i].Total = "八月"
+                }
+                 if(monthlist[i].Total == 9){
+                  monthlist[i].Total = "九月"
+                }
+                 if(monthlist[i].Total == 10){
+                  monthlist[i].Total = "十月"
+                }
+                 if(monthlist[i].Total == 11){
+                  monthlist[i].Total = "十一月"
+                }
+                 if(monthlist[i].Total == 12){
+                  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)
+
+             standArrTwo.map(item=>{
+                monthNolist.push(item)
+              }) 
+
+
+
+             var arrOne = []
+             for(let i=0;i<monthlist.length;i++){
+               for(let j=0;j<monthNolist.length;j++){
+                 if(monthlist[i].Total == monthNolist[j].Total){
+                     monthlist[i].NoCount = monthNolist[j].Count
+                     arrOne.push(monthlist[i])
+                 }
+               }
+             }
+             console.log("arrOne",arrOne)
+              
+            for(const key in arrOne){
+              this.modesData.xAxis.push(arrOne[key].Total);
+              this.modesData.series.push(((arrOne[key].NoCount/arrOne[key].Count)*100).toFixed(1));
+            }
+          
+
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
+           }
+       })
     }
-  }
+  },
+  created(){
+       //获取指标正常范围值
+     this.getNormData()
+  },
 };
 </script>
 

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -9,7 +9,7 @@
         <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="lapseto" placeholder="请选择" style="width:120px;margin-right:20px" @change="changeLapseto">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -89,35 +89,20 @@
         <p class="pointTitle">指标正常范围值</p>
       </div>
       <div class="cell clearfix newDisplay">
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
-        <span class="index">钙(2.25-2.75)</span>
+         <span v-for="(item,index) in normData" :key="index" class="index">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span> 
       </div>
     </div>
   </div>
 </template>
 
 <script>
+const moment = require('moment')
 import echarts from "echarts";
 import { GetOICData } from "@/api/qcd";
 import LineChart from "../../qcd/components/LineChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {getNormData,getFirstQuarter}from "@/api/common/common"
 export default {
   components: {
     LineChart,
@@ -126,38 +111,36 @@ export default {
   data() {
     return {
       activeName: "first",
+      modesData: {
+        xAxis: [],
+        series: []
+       },
       crumbs: [
         { path: false, name: "科室质控" },
         { path: false, name: "科室质控达标统计" },
         { path: false, name: "按时间分组" }
       ],
+      normData:[],
       listQuery: {
         start_time: "",
         end_time: "",
         page: 1,
         limit: 10
       },
+      lapseto:0,
       options: [
         {
-          value: "选项1",
-          label: "黄金糕"
-        },
-        {
-          value: "选项2",
-          label: "双皮奶"
-        },
+          value: 0,
+          label: "全部"
+        }, 
         {
-          value: "选项3",
-          label: "蚵仔煎"
-        },
-        {
-          value: "选项4",
-          label: "龙须面"
-        },
+          value: 1,
+          label: "留治"
+        }, 
         {
-          value: "选项5",
-          label: "北京烤鸭"
-        }
+          value: 2,
+          label: "转出"
+        }, 
       ],
       value: "请选项",
       options1: [
@@ -211,7 +194,7 @@ export default {
         },
         yAxis: {
           axisLabel: {
-            formatter: "{value} %"
+            formatter: "{value}%"
           },
           show: false
         },
@@ -235,7 +218,7 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}%"
               }
             },
             //配置样式
@@ -281,7 +264,7 @@ export default {
               }
             }
           }
-        ]
+        ],
       }
     };
   },
@@ -292,6 +275,14 @@ export default {
       }
     },
     changeTime() {},
+    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)
+    },
+     
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
@@ -311,10 +302,220 @@ export default {
     },
     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)
+      }
+
+      //第二季度
+      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)
+      }
+
+      //第三季度
+      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)
+      }
+
+      //第四季度
+      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)
+      }
+
+      
     },
     chooseMonth(month) {
       this.monthType = 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)
+
+      }
+      //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)
+      }
+      //
+     //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)
+      }
+      //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)
+      }
+      //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)
+      }
+      //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)
+      }
+      //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)
+      }
+      //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)
+      }
+      //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)
+      }
+      //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)
+      }
+      //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)
+      }
+       //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)
+      }
+    },
+    getNormData(){
+      getNormData().then(response=>{
+         if(response.data.state === 1){
+           var normdata = response.data.data.normdata
+           console.log("normdata",normdata)
+           this.normData = normdata
+         }
+      })
+    },
+    //第一季度
+    getFirstQuarter(val,startime,endtime){
+       this.modesData.series = []
+       this.modesData.xAxis = []
+      getFirstQuarter(val,startime,endtime).then(response=>{
+         if(response.data.state === 1){
+            var count =  response.data.data.count
+            console.log("count",count)
+            var arr=[]
+            for(let i=0;i<count.length;i++){  
+               for(let j=0;j<this.normData.length;j++){
+                if(count[i].item_id == this.normData[j].inspection_minor){
+                     arr.push(count[i])
+                }
+              }
+            }
+            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)
+              }
+           for(let i=0;i<arrtwo.length;i++){
+                this.$set(arrtwo[i], 'Total', 1)
+              }
+            arrtwo.map(item => {
+              arr.push(item)
+            })
+            arr.sort(this.compare('sort'))    
+            for(const key in this.normData ){
+               this.modesData.xAxis.push(this.normData[key].item_name);
+                if(key in arr){
+                    this.modesData.series.push(((parseInt(arr[key].Count)/parseInt(arr[key].Total))*100).toFixed(1));
+                } else {
+                 this.modesData.series.push(0);
+              }
+            }
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
+            console.log(2222,this.modesData)
+
+          
+         }
+      })
+    },
+   compare(property){
+        return function(a,b){
+            var value1 = a[property];
+            var value2 = b[property];
+            return value1 - value2;
+        }
+    },
+    arrayDate(array1,array2){
+        var array1 = array1;
+        var array2 = this.normData;
+        var result = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.inspection_minor;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.item_id;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                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)
   }
 };
 </script>

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/patientControlAnalysis.vue

@@ -59,7 +59,7 @@
           <p class="chartTitle">统计表</p>
         </div>
         <div>
-          <el-table :data="tableData" border style="width: 100%">
+          <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>

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -140,7 +140,7 @@ import { GetOICData } from "@/api/qcd";
 import PieChart from "../qcd/components/BarChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveConfiguration,getConfigurationList,getConfigurationDetail,getAllInspectionMinor,UpdateConfiguration,DeleteConfiguration }from "@/api/common/common";
+import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveConfiguration,getConfigurationList,getConfigurationDetail,getAllInspectionMinor,UpdateConfiguration,DeleteConfiguration,getLastSort }from "@/api/common/common";
 export default {
   name: "dialysisTotal",
   data() {
@@ -196,7 +196,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 +216,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,7 +227,7 @@ 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
         }
       })
@@ -237,7 +237,7 @@ export default {
        getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-         console.log("小项",inspection)
+        // console.log("小项",inspection)
          this.InspectionMinorTwo = inspection
         }
       })
@@ -247,13 +247,14 @@ export default {
        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
          }
       })
     },
     saveInspection(formName){
+      
       this.$refs[formName].validate(valid=>{
         if(valid){
           saveConfiguration(this.form).then(response=>{
@@ -267,6 +268,7 @@ export default {
              this.form.min_range = ""
              this.form.sort = ""
              this.getConfigurationList()
+             this.getLastSort()
             }else{
              this.$message.error("检查小项已存在")
             }
@@ -291,10 +293,10 @@ export default {
               configurationlist[i].sort = ""
             }
           }
-          console.log("列表",configurationlist)
+          //console.log("列表",configurationlist)
           this.configuraData = configurationlist
           var total = response.data.data.total
-          console.log("total",total)
+         // console.log("total",total)
           this.total = total
         }
       })
@@ -305,7 +307,7 @@ export default {
         if(response.data.state == 1){
           var minor =  response.data.data.minor
           this.InspectionMinorTwo = minor
-          console.log("minor",minor)
+          //console.log("minor",minor)
         }
       })
     },
@@ -322,7 +324,7 @@ export default {
       UpdateConfiguration(this.editform.id,this.editform).then(response=>{
         if(response.data.state == 1){
          var standard =  response.data.data.standard
-         console.log("standard",standard)
+        // console.log("standard",standard)
          this.$message.success("保存成功")
          this.editDialog = false
          this.getConfigurationList()
@@ -345,12 +347,21 @@ export default {
         DeleteConfiguration(id,index).then(response => {
           if (response.data.state === 1) {
            var msg =  response.data.data.msg
-           console.log("msg",msg)
+          // console.log("msg",msg)
            this.configuraData.splice(index,1)
           }
         });
       });
     },
+    getLastSort(){
+      getLastSort().then(response=>{
+        if(response.data.state === 1){
+          var standard = response.data.data.standard
+         // console.log("standard",standard)
+          this.form.sort = standard.sort + 1+''
+        }
+      })
+    },
   },
   components: {
     PieChart,
@@ -363,6 +374,8 @@ export default {
     this.getConfigurationList()
     //获取所有小项的数据
     this.getAllInspectionMinor()
+    //获取排序值
+    this.getLastSort()
    },
 
 };

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.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,36 @@
     <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" :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>
-        <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="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+          <el-table-column prop="name" label="姓名" fixed>
+            <template slot-scope="scope">{{ scope.row.name}}</template>
+         </el-table-column>
+         <el-table-column
+          :label="modeItem.project_name"
+          property="number"
+          align="center"
+          min-width="100"
+          v-for="(modeItem, index) in tableName"
+          :key="index"
+        >
+          <template slot-scope="scope">
+              {{ scope.row.data[index].Count}}
+          </template>
+        </el-table-column>
         </el-table>
 
         <el-pagination
@@ -68,7 +76,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="listQuery.page"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[20, 40, 60, 80,100]"
           :page-size="10"
           background
           style="margin-top:20px;"
@@ -82,6 +90,7 @@
 
 
 <script>
+  import {getCurrentOrgPatients,getAllMajorInspection,getPatientList,getPatientDetailCheck,SearchDetailCheck } from "@/api/common/common"
 export default {
   data() {
     return {
@@ -89,167 +98,68 @@ 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: "北京烤鸭"
-        }
-      ],
       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: [],
+      patientsData:[],
+      total:0,
+      tableName:[],
+      ObjectData:{},
     };
   },
   methods: {
-    changeTime() {},
+    handleDelete(index, row) {
+        console.log(index, row);
+      },
+    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.getPatientList()
+      }
+    },
+    onSearch(){
+      SearchDetailCheck(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+          if(response.data.state === 1){
+           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){
+                   arr.push(checkDetail[i])
+                 }
+              }
+            }
+            // 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)
+          }
+      })
+    },
+     handleSizeChange(limit) {
+      this.listQuery.limit = limit;
+       this.getPatientList()
+    },
+    handleCurrentChange(page) {
+      this.listQuery.page = page;
+       this.getPatientList()
+    },
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
@@ -257,8 +167,209 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+        this.getPatientList()
       }
+    },
+    //获取病人列表
+    getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+         if(response.data.state === 1){
+            var patients = response.data.data.patients
+            this.patientsData = patients
+         }
+      })
+    },
+    //获取检验检查项目
+    getAllMajorInspection(){
+      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
+        }
+      })
+    },
+    getPatientList(){
+      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 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 = []
+          for(let i=0;i<list.length;i++){
+              for(let j=0;j<this.tableName.length;j++){
+                  if(list[i].ProjectId == this.tableName[j].inspection_major){
+                    dtd.push(list[i])
+                  }
+              }
+          }
+          console.log("dtd",dtd)
+          var dd = {};
+           for (const index in dtd) {
+            if (!(dtd[index].name in dd)) {
+               dd[dtd[index].name] = {};
+            }
+            if (!(dtd[index].ProjectId in dd[dtd[index].name]) && dtd[index].ProjectId != 0) {
+              dd[dtd[index].name][dtd[index].ProjectName] = dtd[index];
+            }
+          }
+          console.log("ddd",dd)
+            for(const key in dd){
+              for(const mkey in this.ObjectData){
+                if (!(this.ObjectData[mkey].project_name in dd[key])) {
+                  dd[key][this.ObjectData[mkey].project_name] = {
+                    ProjectName: this.ObjectData[mkey].project_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.project_name)
+            })
+            this.tableData.map(item => {
+              let arr = Object.values(item.data);
+              arr.sort((a,b)=>{
+                return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);
+              });
+              item.data = arr
+            })
+         }
+      })
+    },
+    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
+            console.log("checkDetail",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){
+                   arr.push(checkDetail[i])
+                 }
+              }
+            }
+            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)
+            this.total = 1
+            console.log("arr",this.tableData)
+          }
+      })
+    },
+   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.getCurrentOrgPatients()
+     //获取检验检查项目
+     this.getAllMajorInspection()
+     //获取列表数据
+     this.getPatientList()
   }
 };
 </script>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.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>
@@ -29,6 +21,7 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
+        :picker-options="pickerOptions"
       ></el-date-picker>
       <span class>-</span>
       <el-date-picker
@@ -42,14 +35,24 @@
         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 :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" :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">
@@ -66,6 +69,7 @@
 <script>
 import echarts from "echarts";
 import LineChart from "../../components/LineChart";
+import { getCurrentOrgPatients,getInspectionTotalCount,getInspectionDetailById,getSearchPatientInfo } from "@/api/common/common";
 export default {
   components: {
     LineChart
@@ -78,90 +82,17 @@ 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",
-          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:[],
+      tableData:[],
       chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
         tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
-        },
+        // legend: {
+        //   data: ["次数"],
+        //   left: 0
+        // },
         xAxis: {
-          data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -173,23 +104,23 @@ export default {
           {
             name: "次数",
             type: "bar",
-            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: (params) => {
+                  if(this.obj.length > 0){
+                      let str = ''
+                      str = params.data +'次' + '\n(参考值'+ this.obj[params.dataIndex] +'次)'
+                    return str
+                  }else{
+                    let str = ''
+                    str = params.data+'次'
+                    return str
+                  }
+                }
               }
             },
             //配置样式
@@ -236,7 +167,18 @@ export default {
             }
           }
         ]
-      }
+      },
+      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;;
+        }
+      }, 
+      modesData: {
+        xAxis: [],
+        series: []
+      },
+      obj:[]
     };
   },
   methods: {
@@ -249,7 +191,192 @@ export default {
         this.listQuery.end_time = "";
       } else {
       }
-    }
+    },
+    getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+         var patients = response.data.data.patients
+         this.patientsData = patients
+      })
+    },
+    getInspectionTotalCount(){
+          this.modesData.series = []
+          this.modesData.xAxis = []
+      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++){
+                 if(Inspection[i].inspection_major == counts[j].ProjectId){
+                   arr.push(counts[j])
+                 }
+               }
+            }
+             console.log("arr",arr)
+             var arrtwo =  this.arrayDate(counts,this.normData)
+             console.log("arrtwo",arrtwo)
+            var hash = {};
+            var i = 0;
+            var res = [];
+            arr.forEach(function(item) {
+             var ProjectName = item.ProjectName;
+             hash[ProjectName] ? res[hash[ProjectName] - 1].Count.push(item.Count) : hash[ProjectName] = ++i && res.push({
+                 Count: [item.Count],
+                 ProjectName: ProjectName,
+                 ProjectId: item.ProjectId,
+                 Sort:item.Sort,
+             })
+            });
+            
+            res.map(item => {
+             item.Count = eval(item.Count.join('+'))
+            })
+            console.log(11111,res)
+            let arr1 = []
+            this.tableData.map(it => {
+              arr1.push(it.project_name)
+            })
+
+            arr1.forEach((item,index)=>{
+              if(!(res[index] && item ==res[index].ProjectName)){
+                res.splice(index,0,{Count:0, ProjectName: item, Sort: index+1})
+              }
+            })
+            res.map(item => {
+              this.modesData.series.push(parseInt(item.Count));
+            })
+
+
+            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);
+              // }
+            }
+
+
+            
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
+            console.log(2222,this.modesData)
+          }
+      })
+    },
+
+    //获取单个病人数据
+    handleChange(val){
+      this.modesData.series = []
+      this.modesData.xAxis = []
+       getInspectionDetailById(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+          if(response.data.state === 1){
+            var patientdetail = response.data.data.patientdetail
+            console.log("patientdetail",patientdetail)
+            var arr=[]
+            for(let i=0;i<this.tableData.length;i++){
+              for(let j=0;j<patientdetail.length;j++){
+                 if(this.tableData[i].inspection_major == patientdetail[j].ProjectId){
+                    arr.push(patientdetail[j])
+                 }
+              }
+            }
+            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)))
+            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
+          }
+       })
+    },
+
+    //搜索功能
+    onSearch(){
+      getSearchPatientInfo(this.listQuery.search,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)
+           var arr = []
+           for(let i=0;i<this.tableData.length;i++){
+             for(let j=0;j<PatientsInfo.length;j++){
+                 if(this.tableData[i].inspection_major == PatientsInfo[j].ProjectId){
+                    arr.push(PatientsInfo[j])
+                 }
+             }
+           }
+           console.log("arr",arr)
+         }
+      })
+    },
+    arrayDate(array1,array2){
+        var array1 = array1;
+        var array2 = this.tableData;
+        var result = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.inspection_major;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.ProjectId;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                result.push(obj);
+            }
+        }
+        console.log("result",result)
+        return result;
+    },
+  },
+  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.getInspectionTotalCount()
   }
 };
 </script>

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

@@ -2,10 +2,10 @@
   <div class="page_timeAll">
     <div class="cell clearfix">
       <el-select
-        v-model="value"
+        v-model="listQuery.value"
         placeholder="请选择"
-        @change="chooseType"
         style="width:120px;margin-right:20px"
+        @change="selectChange"
       >
         <el-option
           v-for="item in options"
@@ -28,6 +28,7 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
+        :picker-options="pickerOptions"
       ></el-date-picker>
       <span class>-</span>
       <el-date-picker
@@ -41,6 +42,7 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
+        :picker-options="pickerOptions"
       ></el-date-picker>
     </div>
     <div class="tableTitle">统计图</div>
@@ -49,13 +51,35 @@
     </div>
     <div class="tableTitle">统计表</div>
     <div>
-      <el-table :data="tableData" 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="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+        <el-table-column
+          fixed
+          label="日期"
+          width="100"
+          property="date"
+          align="center"
+        ></el-table-column>
+
+        <el-table-column
+          :label="modeItem.name"
+          property="number"
+          align="center"
+          min-width="100"
+          v-for="(modeItem, index) in activeModes"
+          :key="index"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.data[modeItem.id].number ? scope.row.data[modeItem.id].number : "" }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          fixed="right"
+          label="总次数"
+          width="80"
+          property="total"
+          align="center"
+        ></el-table-column>
       </el-table>
 
       <el-pagination
@@ -63,7 +87,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="listQuery.page"
-        :page-sizes="[10, 20, 50, 100]"
+        :page-sizes="[20, 40, 60, 80,100]"
         :page-size="10"
         background
         style="margin-top:20px;"
@@ -77,134 +101,35 @@
 <script>
 import echarts from "echarts";
 import LineChart from "../../components/LineChart";
+import {geStatistics} from "@/api/common/common"
 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
+          value: 0,
+          label: "全部"
         },
         {
-          date: "2016-05-08",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
+          value: 1,
+          label: "留治"
         },
         {
-          date: "2016-05-06",
-          name: "王小虎",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
+          value: 2,
+          label: "转出"
         },
-        {
-          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: ["次数"],
+          data: ["次"],
           left: 0
         },
         xAxis: {
-          data: ["达标", "未达标"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -214,9 +139,9 @@ export default {
         },
         series: [
           {
-            name: "次数",
+            name: "次",
             type: "bar",
-            data: ["78.57", "50"],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
@@ -235,8 +160,14 @@ export default {
                   //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
                   var colorList = [
                     ["#A9E0F3", "#9FBDFC"],
-
-                    ["#FFD7C0", "#FF9994"]
+                    ["#A9E0F3", "#9FBDFC"],
+                    ["#A9E0F3", "#9FBDFC"],
+                    ["#FFD7C0", "#FF9994"],
+                    ["#FFD7C0", "#FF9994"],
+                    ["#FFD7C0", "#FF9994"],
+                    ["#D7C3FD", "#B3A8F7"],
+                    ["#D7C3FD", "#B3A8F7"],
+                    ["#D7C3FD", "#B3A8F7"]
                   ];
 
                   var index = params.dataIndex;
@@ -254,19 +185,49 @@ export default {
               },
 
               //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
-              }
+              // emphasis: {
+              //   shadowBlur: 10,
+              //   shadowOffsetX: 0,
+              //   shadowColor: "rgba(0, 0, 0, 0.5)"
+              // }
             }
           }
         ]
-      }
+      },
+      modeOptions:[],
+      total:0,
+      listQuery: {
+        start_time: "",
+        end_time: "",
+        page: 1,
+        limit: 20,
+        value: 0,
+        mode_id:"",
+      },
+      tableData:[],
+      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;;
+        }
+      },
     };
   },
   methods: {
-    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.geStatistics()
+      }
+
+    },
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
@@ -274,9 +235,138 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+        this.geStatistics()
       }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    handleSizeChange(limit) {
+      this.listQuery.limit = limit;
+      this.geStatistics();
+    },
+    handleCurrentChange(page) {
+      this.listQuery.page = page;
+      this.geStatistics();
+    },
+   selectChange(val){
+     this.listQuery.value =val
+     this.geStatistics()
+   },
+    geStatistics(){
+      this.modesData.series = []
+      this.modesData.xAxis = []
+      geStatistics(this.listQuery).then(response=>{
+        if(response.data.state === 1){
+          var dtd =  response.data.data.statistics
+        //  console.log("dtd",dtd)
+          var dd = {};
+          for (const index in dtd) {
+            if (!(dtd[index].date in dd)) {
+               dd[dtd[index].date] = {};
+            }
+            if (!(dtd[index].mode_id in dd[dtd[index].date]) && dtd[index].mode_id != "0") {
+              dd[dtd[index].date][dtd[index].mode_id] = dtd[index];
+            }
+          }
+          console.log("ddd",dd)
+          for (const key in dd) {
+            var total = 0;
+            for (const mkey in this.modeOptions) {
+              if (mkey in dd[key]) {
+                dd[key][mkey].mode = this.modeOptions[mkey].name;
+                var number = parseInt(dd[key][mkey].number);
+                if (isNaN(number) || number == 0) {
+                  dd[key][mkey].number = "";
+                  number = 0;
+                }
+                total += number;
+              } else {
+                dd[key][mkey] = {
+                  mode: this.modeOptions[mkey].name,
+                  mode_id: mkey,
+                  number: 0
+                };
+              }
+            }
+            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;
+    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.geStatistics()
+      console.log("activeModes",this.activeModes)
+  },
+  computed: {
+    activeModes: function() {
+      var modes = [];
+      for (const key in this.modeOptions) {
+        if (this.listQuery.mode_id == key || this.listQuery.mode_id == "") {
+          modes.push(this.modeOptions[key]);
+        }
+      }
+
+      return modes;
+
     }
-  }
+  },
 };
 </script>
 
@@ -294,5 +384,10 @@ export default {
   .cell {
     text-align: center;
   }
+  .el-table{
+    ::-webkit-scrollbar{
+      height: 15px;
+    }
+  }
 }
 </style>

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>
@@ -29,6 +21,7 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
+        :picker-options="pickerOptions"
       ></el-date-picker>
       <span class>-</span>
       <el-date-picker
@@ -42,25 +35,48 @@
         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 :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" :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>
-        <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 :row-style="{ color: '#303133' }" 
+        :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+        >
+          <el-table-column prop="name" label="姓名" width="140">
+            <!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
+          </el-table-column>
+          <el-table-column  label="年龄" width="140">
+             <template slot-scope="scope">{{ getAge(scope.row.id_card_no) }}</template>
+          </el-table-column>
+          <el-table-column prop="dialysis_no" label="透析号" width="140">
+              <!-- <template slot-scope="scope">{{ scope.row.dialysis_no }}</template> -->
+          </el-table-column>
+          <el-table-column prop="mode_id" label="透析模式">
+              <template slot-scope="scope">
+                <span>{{ scope.row.mode_id.join("、") }}</span>
+              </template>
+           </el-table-column>
+          <el-table-column prop="address" label="透析总次数" width="140">
+            <template slot-scope="scope">
+                <span>{{ scope.row.total_dialysis + scope.row.user_sys_before_count }}</span>
+              </template>
+          </el-table-column>
         </el-table>
 
         <el-pagination
@@ -68,7 +84,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="listQuery.page"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[20, 40, 60, 80, 100]"
           :page-size="10"
           background
           style="margin-top:20px;"
@@ -82,6 +98,8 @@
 
 
 <script>
+ import { getCurrentOrgPatients,getDialysisList,getDialysisDetailById,getPrescriptionByName } from "@/api/common/common";
+ import { uParseTime } from "@/utils/tools";
 export default {
   data() {
     return {
@@ -89,167 +107,36 @@ 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:[],
+      prescriptionList:[],
+      limit:1000,
+      page:1,
+      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;;
         }
-      ]
+      }, 
     };
   },
   methods: {
-    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.getDialysisList()
+      }
+      
+    },
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
@@ -257,8 +144,306 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+        this.getDialysisList()
+      }
+    },
+   getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    getCurrentOrgPatients(){
+      getCurrentOrgPatients().then(response=>{
+         if(response.data.state == 1){
+           var patients = response.data.data.patients
+           this.patientsData = patients
+         }
+      })
+    },
+    getTime(time) {
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    handleSizeChange(limit) {
+      this.listQuery.limit = limit;
+      this.getDialysisList();
+    },
+    handleCurrentChange(page) {
+      this.listQuery.page = page;
+      this.getDialysisList();
+    },
+    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)
+          var totallist  =  response.data.data.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
+            if (!dataInfo[patient_id]) {
+              dataInfo[patient_id] = {
+                patient_id,
+                name:item.name,
+                id_card_no:item.id_card_no,
+                dialysis_no:item.dialysis_no,
+                total_dialysis:item.total_dialysis,
+                user_sys_before_count:item.user_sys_before_count,
+                mode_id: []
+              }
+            }
+          })
+          let list = Object.values(dataInfo)
+          //console.log("arr",list)    
+          list.map(item => {
+            for (let i = 0; i < prescriptionList.length; i++) {
+              if (item.patient_id === prescriptionList[i].patient_id) {
+                item.mode_id.push(prescriptionList[i].mode_id)
+              }
+            }
+          })
+        //  console.log("list---",list)
+          this.DialysisData = list
+         }
+      })
+    },
+    getAge(UUserCard) {
+			if (UUserCard != null && UUserCard != '') {
+				//获取年龄
+				var myDate = new Date();
+				var month = myDate.getMonth() + 1;
+				var day = myDate.getDate();
+				var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
+				if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+					age++;
+				}
+				return age;
+			}
+    },
+    onSearch(){
+      if(this.listQuery.search == "" || this.listQuery.search == null){
+         this.getDialysisList()
+         return false
+      }else{
+       getPrescriptionByName(this.listQuery.search,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)
+           //console.log("patient",patients)
+           var hash = {};
+           var i = 0;
+           var res = [];
+           patients.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,
+                id_card_no:item.id_card_no,
+                total_dialysis:item.total_dialysis,
+                user_sys_before_count:item.user_sys_before_count,
+            })
+           });
+           this.DialysisData = res
+           var total =  response.data.data.total
+           this.total = res.length
+          // console.log("total",total)
+         }
+       })
+      }
+    
+    },
+    unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.mode_id) && res.set(arr.mode_id, 1));
+      },
+    handleChange(val){
+       getDialysisDetailById(val.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.patients
+            this.getModeId(patients)
+            // console.log("patients",patients)
+            var hash = {};
+            var i = 0;
+            var res = [];
+            patients.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,
+                  id_card_no:item.id_card_no,
+                  total_dialysis:item.total_dialysis,
+                  user_sys_before_count:item.user_sys_before_count,
+              })
+            });
+            this.DialysisData = res
+           // console.log(res)
+            var total =  response.data.data.total
+            this.total = res.length
+            // console.log("total",total)
+          }
+       })
+     
+    },
+    getModeId(patients){
+      for(let i=0;i<patients.length;i++){
+        if(patients[i].mode_id == 1){
+          patients[i].mode_id = "HD"
+        }else if(patients[i].mode_id == 2){
+          patients[i].mode_id = "HDF"
+        }else if(patients[i].mode_id == 3){
+          patients[i].mode_id = "HD+HP"
+        }else if(patients[i].mode_id == 4){
+          patients[i].mode_id = "HP"
+        }else if(patients[i].mode_id == 5){
+          patients[i].mode_id = "HF"
+        }else if(patients[i].mode_id == 6){
+          patients[i].mode_id = "SCUF"
+        }else if(patients[i].mode_id == 7){
+          patients[i].mode_id = "IUF"
+        }else if(patients[i].mode_id == 8){
+          patients[i].mode_id = "HFHD"
+        }else if(patients[i].mode_id == 9){
+          patients[i].mode_id = "HFHD+HP"
+        }else if(patients[i].mode_id == 10){
+          patients[i].mode_id = "PHF"
+        }else if(patients[i].mode_id == 11){
+          patients[i].mode_id = "HFR"
+        }else if(patients[i].mode_id == 12){
+          patients[i].mode_id = "HDF+HP"
+        }else if(patients[i].mode_id == 13){
+          patients[i].mode_id = "CRRT"
+        }else if(patients[i].mode_id == 14){
+          patients[i].mode_id = "腹水回输"
+        }else if(patients[i].mode_id == 15){
+            patients[i].mode_id = "HD前置换"
+        }else if(patients[i].mode_id == 16){
+            patients[i].mode_id = "HD后置换"
+        }else if(patients[i].mode_id == 17){
+            patients[i].mode_id = "HDF前置换"
+        }else if(patients[i].mode_id == 18){
+            patients[i].mode_id = "HDF后置换"
+        }else if(patients[i].mode_id == 19){
+          patients[i].mode_id = "IUF+HD"
+        }
       }
     }
+  },
+  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>

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -66,7 +66,7 @@
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" border show-summary>
+          <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>

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -66,7 +66,7 @@
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" border show-summary>
+          <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>

src/xt_pages/user/inspection.vue

@@ -178,11 +178,10 @@
               <el-date-picker
                 style="width:95%"
                 v-model="form.inspect_date"
-                type="date"
-                value-format="yyyy-MM-dd"
-                format="yyyy-MM-dd"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
                 placeholder="选择日期"
-                :readonly="form.method == 'add' ? false : true"
               >
               </el-date-picker>
             </el-form-item>
@@ -248,18 +247,18 @@
 </template>
 
 <script>
-import PatientSidebar from "./components/PatientSidebar";
+import PatientSidebar from './components/PatientSidebar'
 import {
   fetchInspectionReference,
   CreatePatientInspection,
   fetchPatientInspections,
   EditPatientInspection,
   DeletePatientInspection
-} from "@/api/inspection";
-import { uParseTime, isPositiveNumber } from "@/utils/tools";
+} from '@/api/inspection'
+import { uParseTime, isPositiveNumber } from '@/utils/tools'
 
 export default {
-  name: "Inspection",
+  name: 'Inspection',
   components: { PatientSidebar },
   data() {
     return {
@@ -267,22 +266,23 @@ export default {
       pageLoading: true,
       itemLoading: false,
       formLoading: false,
-      itemDate: "",
+      itemDate: '',
       patientID: 0,
-      panelClass: "patient-app-container",
+      panelClass: 'patient-app-container',
       patientInfo: {
         id: 0
       },
-      itemName: "请选择项目",
-      formTitle: "",
+      itemName: '请选择项目',
+      formTitle: '',
       dialogFormVisible: false,
       patient_info: null,
       form: {
-        remind_cycle: "",
-        method: "add",
+        remind_cycle: '',
+        method: 'add',
         project_id: 0,
-        inspect_date: "",
-        formItem: [{ id: 0, value: "" }]
+        inspect_date: '',
+        old_inspect_date: '',
+        formItem: [{ id: 0, value: '' }]
       },
       formItem: [],
       items: [],
@@ -295,112 +295,100 @@ export default {
         project_id: 0,
         page: 1
       }
-    };
+    }
   },
   methods: {
     deleteInspection() {
-      if (this.project == null || this.itemDate == "") {
-        this.$message.error("请先选择删除删除的记录");
-        return false;
+      if (this.project == null || this.itemDate == '') {
+        this.$message.error('请先选择删除删除的记录')
+        return false
       }
 
-      this.$confirm("确认删除此记录?", "删除", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确认删除此记录?', '删除', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           var params = {
             patient: this.patientID,
             date: this.itemDate,
             project_id: this.project.project_id
-          };
+          }
           DeletePatientInspection(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
               for (var index in this.projects) {
                 if (this.projects[index].project_id == params.project_id) {
-                  this.projects[index].count--;
-                  break;
+                  this.projects[index].count--
+                  break
                 }
               }
-              this.total -= 1;
-              this.itemDate = "";
-              this.items = [];
+              this.total -= 1
+              this.itemDate = ''
+              this.items = []
               if (this.total > 0) {
-                this.queryParams.page = 1;
-                this.fetchPatientInspections(this.queryParams);
+                this.queryParams.page = 1
+                this.fetchPatientInspections(this.queryParams)
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     openEdit() {
       if (this.project == null) {
-        this.$message.error("请先选择项目");
-        return false;
+        this.$message.error('请先选择项目')
+        return false
       }
 
-      this.form.method = "edit";
-      this.formTitle = "修改" + this.project.project_name;
-      this.form.project_id = this.project.project_id;
-      this.form.inspect_date = this.itemDate;
-      this.form.remind_cycle = this.patient_info.remind_cycle;
-      console.log(this.form.remind_cycle);
+      this.form.method = 'edit'
+      this.formTitle = '修改' + this.project.project_name
+      this.form.project_id = this.project.project_id
+      this.form.inspect_date = this.itemDate
+      this.form.old_inspect_date = this.itemDate
+      this.form.remind_cycle = this.patient_info.remind_cycle
+      console.log(this.form.remind_cycle)
 
-      this.form.formItem = [];
+      this.form.formItem = []
       for (var index in this.project.inspection_reference) {
         this.form.formItem.push({
-          id:
-            this.project.inspection_reference[index].id in this.inspectionsMap
-              ? this.inspectionsMap[this.project.inspection_reference[index].id]
-                  .id
-              : 0,
+          id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
           project_id: this.project.inspection_reference[index].project_id,
           project_name: this.project.inspection_reference[index].project_name,
           item_id: this.project.inspection_reference[index].id,
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value:
-            this.project.inspection_reference[index].id in this.inspectionsMap
-              ? this.inspectionsMap[this.project.inspection_reference[index].id]
-                  .inspect_value
-              : "",
-          select_options: this.project.inspection_reference[
-            index
-          ].range_options.split(","),
+          value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
+          select_options: this.project.inspection_reference[index].range_options.split(','),
           unit: this.project.inspection_reference[index].unit
-        });
+        })
       }
-
-      console.log(this.form.formItem);
-
-      this.dialogFormVisible = true;
+      console.log(this.form.formItem)
+      this.dialogFormVisible = true
     },
     openNew() {
       if (this.project == null) {
-        this.$message.error("请先选择项目");
-        return false;
+        this.$message.error('请先选择项目')
+        return false
       }
-      this.form.method = "add";
-      this.formTitle = "新增" + this.project.project_name;
-      this.form.project_id = this.project.project_id;
-      this.form.remind_cycle = this.patient_info.remind_cycle;
-
-      var today = new Date();
-      this.form.inspect_date = uParseTime(today, "{y}-{m}-{d}");
-      this.form.formItem = [];
+      this.form.method = 'add'
+      this.formTitle = '新增' + this.project.project_name
+      this.form.project_id = this.project.project_id
+      this.form.remind_cycle = this.patient_info.remind_cycle
+      var today = new Date()
+      this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
+      this.form.formItem = []
       for (var index in this.project.inspection_reference) {
         // var formItem = this.project.inspection_reference[index];
         // formItem["value"] = '';
@@ -415,114 +403,106 @@ export default {
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value: "",
+          value: '',
           select_options: this.project.inspection_reference[
             index
-          ].range_options.split(","),
+          ].range_options.split(','),
           unit: this.project.inspection_reference[index].unit
-        });
+        })
       }
 
-      this.dialogFormVisible = true;
+      this.dialogFormVisible = true
     },
     submitEdit(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.formLoading = true;
+          this.formLoading = true
           if (this.form.formItem.length == 0) {
-            this.$message.error("未填写项目");
-            return false;
+            this.$message.error('未填写项目')
+            return false
           }
           for (var index in this.form.formItem) {
-            this.form.formItem[index].value =
-              "" + this.form.formItem[index].value;
+            this.form.formItem[index].value = '' + this.form.formItem[index].value
           }
 
-          EditPatientInspection(
-            this.patientID,
-            this.form,
-            this.form.remind_cycle,
-            this.form.inspect_date,
-            this.form.project_id
-          )
-            .then(response => {
-              if (response.data.state == 1) {
-                this.$notify({
-                  title: "成功",
-                  message: "修改成功",
-                  type: "success",
-                  duration: 2000
-                });
-                this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle;
-                this.itemDate = this.form.inspect_date;
-                this.items = [];
-                var inspections = response.data.data.inspections;
-                this.inspections = response.data.data.inspections;
-                if (inspections == null) {
-                  this.inspections = [];
-                  return false;
-                }
-                var inspectionsMap = {};
-                this.inspectionsMap = {};
-                for (var index in inspections) {
-                  inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
-                  this.inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
-                }
-                var items = this.project.inspection_reference;
-                for (var index in items) {
-                  if (items[index].id in inspectionsMap) {
-                    var item = {};
-                    for (var key in items[index]) {
-                      item[key] = items[index][key];
-                    }
-                    item.value = inspectionsMap[items[index].id].inspect_value;
-                    item.value_direction = "";
-                    if (item.range_type == 1) {
-                      var value = parseFloat(item.value);
-                      var range_min = parseFloat(item.range_min);
-                      var range_max = parseFloat(item.range_max);
-                      if (value < range_min) {
-                        item.value_direction = "↓";
-                      } else if (value > range_max) {
-                        item.value_direction = "↑";
-                      }
+          EditPatientInspection(this.patientID, this.form, this.form.remind_cycle, this.form.inspect_date, this.form.project_id).then(response => {
+            if (response.data.state == 1) {
+              this.$notify({
+                title: '成功',
+                message: '修改成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.patient_info.remind_cycle =
+                  response.data.data.remind_cycle
+              this.itemDate = this.form.inspect_date
+              this.items = []
+              var inspections = response.data.data.inspections
+              this.inspections = response.data.data.inspections
+              if (inspections == null) {
+                this.inspections = []
+                return false
+              }
+              var inspectionsMap = {}
+              this.inspectionsMap = {}
+              for (var index in inspections) {
+                inspectionsMap[inspections[index].item_id] =
+                    inspections[index]
+                this.inspectionsMap[inspections[index].item_id] =
+                    inspections[index]
+              }
+              var items = this.project.inspection_reference
+              for (var index in items) {
+                if (items[index].id in inspectionsMap) {
+                  var item = {}
+                  for (var key in items[index]) {
+                    item[key] = items[index][key]
+                  }
+                  item.value = inspectionsMap[items[index].id].inspect_value
+                  item.value_direction = ''
+                  if (item.range_type == 1) {
+                    var value = parseFloat(item.value)
+                    var range_min = parseFloat(item.range_min)
+                    var range_max = parseFloat(item.range_max)
+                    if (value < range_min) {
+                      item.value_direction = '↓'
+                    } else if (value > range_max) {
+                      item.value_direction = '↑'
                     }
-                    this.items.push(item);
                   }
+                  this.items.push(item)
                 }
-
-                this.resetForm(formName);
-                this.dialogFormVisible = false;
-              } else {
-                this.$message.error(response.data.msg);
-                return false;
               }
-            })
+
+              this.resetForm(formName)
+              this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.data.msg)
+              return false
+            }
+          })
             .catch(v => {
-              this.$message.error(v);
-              return false;
-            });
-          this.formLoading = false;
-          return false;
+              this.$message.error(v)
+              return false
+            })
+          this.formLoading = false
+          return false
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
     submitNew(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.formLoading = true;
+          this.formLoading = true
           if (this.form.formItem.length == 0) {
-            this.$message.error("未填写项目");
-            return false;
+            this.$message.error('未填写项目')
+            return false
           }
           for (var index in this.form.formItem) {
             this.form.formItem[index].value =
-              "" + this.form.formItem[index].value;
+              '' + this.form.formItem[index].value
           }
           CreatePatientInspection(
             this.patientID,
@@ -532,237 +512,207 @@ export default {
             .then(response => {
               if (response.data.state == 1) {
                 this.$notify({
-                  title: "成功",
-                  message: "新增成功",
-                  type: "success",
+                  title: '成功',
+                  message: '新增成功',
+                  type: 'success',
                   duration: 2000
-                });
+                })
                 // this.form.remind_reycle = response.data.data.remind_reycc
                 this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle;
-                console.log(this.patient_info.remind_cycle);
+                  response.data.data.remind_cycle
+                console.log(this.patient_info.remind_cycle)
 
-                this.itemDate = this.form.inspect_date;
-                console.log(this.itemDate);
-
-                this.items = [];
+                this.itemDate = this.form.inspect_date
+                this.items = []
                 for (var index in this.projects) {
                   if (this.projects[index].project_id == this.form.project_id) {
-                    this.projects[index].count++;
-                    break;
+                    this.projects[index].count++
+                    break
                   }
                 }
-                this.total += 1;
-                var inspections = response.data.data.inspections;
-                this.inspections = response.data.data.inspections;
+                this.total += 1
+                var inspections = response.data.data.inspections
+                this.inspections = response.data.data.inspections
                 if (inspections == null) {
-                  this.inspections = [];
-                  return false;
+                  this.inspections = []
+                  return false
                 }
-                var inspectionsMap = {};
-                this.inspectionsMap = {};
+                var inspectionsMap = {}
+                this.inspectionsMap = {}
                 for (var index in inspections) {
                   inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
+                    inspections[index]
                   this.inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
+                    inspections[index]
                 }
-                var items = this.project.inspection_reference;
+                var items = this.project.inspection_reference
                 for (var index in items) {
                   if (items[index].id in inspectionsMap) {
-                    var item = {};
+                    var item = {}
                     for (var key in items[index]) {
-                      item[key] = items[index][key];
+                      item[key] = items[index][key]
                     }
-                    item.value = inspectionsMap[items[index].id].inspect_value;
-                    item.value_direction = "";
+                    item.value = inspectionsMap[items[index].id].inspect_value
+                    item.value_direction = ''
                     if (item.range_type == 1) {
-                      var value = parseFloat(item.value);
-                      var range_min = parseFloat(item.range_min);
-                      var range_max = parseFloat(item.range_max);
+                      var value = parseFloat(item.value)
+                      var range_min = parseFloat(item.range_min)
+                      var range_max = parseFloat(item.range_max)
                       if (value < range_min) {
-                        item.value_direction = "↓";
+                        item.value_direction = '↓'
                       } else if (value > range_max) {
-                        item.value_direction = "↑";
+                        item.value_direction = '↑'
                       }
                     }
-                    this.items.push(item);
+                    this.items.push(item)
                   }
                 }
 
-                this.resetForm(formName);
-                this.dialogFormVisible = false;
+                this.resetForm(formName)
+                this.dialogFormVisible = false
 
-                this.queryParams.patient = this.patientID;
-                this.queryParams.project_id = this.project.project_id;
-                this.queryParams.page = 1;
-                this.total = 0;
-                this.fetchPatientInspections(this.queryParams);
+                this.queryParams.patient = this.patientID
+                this.queryParams.project_id = this.project.project_id
+                this.queryParams.page = 1
+                this.total = 0
+                this.fetchPatientInspections(this.queryParams)
               } else {
-                this.$message.error(response.data.msg);
-                return false;
+                this.$message.error(response.data.msg)
+                return false
               }
             })
             .catch(v => {
-              this.$message.error(v);
-              return false;
-            });
-          this.formLoading = false;
-          return false;
+              this.$message.error(v)
+              return false
+            })
+          this.formLoading = false
+          return false
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
     fetchInspectionReference() {
       fetchInspectionReference(this.patientID)
         .then(response => {
           if (response.data.state == 1) {
-            var reference = response.data.data.reference;
-            var patient_info = response.data.data.patient_info;
-            this.projects = reference;
-            this.patient_info = patient_info;
-            this.pageLoading = false;
-            this.form.remind_cycle = this.patient_info.remind_cycle;
+            var reference = response.data.data.reference
+            var patient_info = response.data.data.patient_info
+            this.projects = reference
+            this.patient_info = patient_info
+            this.pageLoading = false
+            this.form.remind_cycle = this.patient_info.remind_cycle
           } else {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           }
         })
-        .catch(v => {});
+        .catch(v => {})
     },
     setCurrent(row) {
-      this.$refs.singleTable.setCurrentRow(row);
+      this.$refs.singleTable.setCurrentRow(row)
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields();
+      this.$refs[formName].resetFields()
     },
     handleCurrentChange(row) {
-      this.itemDate = "";
-      this.form.method = "add";
-      if (typeof row === "undefined" || row == null) {
-        this.project = null;
-        this.items = [];
-        this.itemName = "请选择项目";
+      this.itemDate = ''
+      this.form.method = 'add'
+      if (typeof row === 'undefined' || row == null) {
+        this.project = null
+        this.items = []
+        this.itemName = '请选择项目'
       } else {
-        this.itemLoading = true;
-        this.project = row;
-        this.items = row.inspection_reference;
-        this.itemName = row.project_name;
-
-        this.queryParams.patient = this.patientID;
-        this.queryParams.project_id = this.project.project_id;
-        this.queryParams.page = 1;
-        this.total = 0;
-        this.fetchPatientInspections(this.queryParams);
+        this.itemLoading = true
+        this.project = row
+        this.items = row.inspection_reference
+        this.itemName = row.project_name
+
+        this.queryParams.patient = this.patientID
+        this.queryParams.project_id = this.project.project_id
+        this.queryParams.page = 1
+        this.total = 0
+        this.fetchPatientInspections(this.queryParams)
       }
     },
 
     handleCurrentChangePage(val) {
-      this.itemLoading = true;
-      this.queryParams.page = val;
-      this.fetchPatientInspections(this.queryParams);
+      this.itemLoading = true
+      this.queryParams.page = val
+      this.fetchPatientInspections(this.queryParams)
     },
     fetchPatientInspections(params) {
-      this.items = [];
+      this.items = []
       fetchPatientInspections(params)
         .then(response => {
           if (response.data.state == 1) {
-            var inspections = response.data.data.inspections;
-            this.total = response.data.data.total;
-            this.itemDate = response.data.data.date.split(" ")[0];
-            this.inspections = response.data.data.inspections;
+            var inspections = response.data.data.inspections
+            this.total = response.data.data.total
+            this.itemDate = response.data.data.date
+            this.inspections = response.data.data.inspections
             if (inspections == null) {
-              this.inspections = [];
-              return false;
+              this.inspections = []
+              return false
             }
-            var inspectionsMap = {};
-            this.inspectionsMap = {};
+            var inspectionsMap = {}
+            this.inspectionsMap = {}
             for (var index in inspections) {
-              console.log(inspections[index])
-              inspectionsMap[inspections[index].item_id] = inspections[index];
-
-              this.inspectionsMap[inspections[index].item_id] =
-                inspections[index];
+              inspectionsMap[inspections[index].item_id] = inspections[index]
+              this.inspectionsMap[inspections[index].item_id] = inspections[index]
             }
-            var items = this.project.inspection_reference;
-
-            console.log(items)
-            console.log(inspectionsMap)
-
-
-
+            var items = this.project.inspection_reference
             for (var index in items) {
-
-              if (
-                items[index].id in inspectionsMap ||
-                items[index].item_id in inspectionsMap
-              ) {
-
-
-                var item = {};
+              if (items[index].id in inspectionsMap || items[index].item_id in inspectionsMap) {
+                var item = {}
                 for (var key in items[index]) {
-                  item[key] = items[index][key];
+                  item[key] = items[index][key]
                 }
-                console.log(item.item_id);
-
                 if (item.item_id > 0) {
-                  console.log(item)
-                  console.log(items[index].item_id)
-                  console.log(inspectionsMap)
-
-                  console.log(inspectionsMap[parseInt(items[index].item_id)].inspect_value)
-
-                  item.value =
-                    inspectionsMap[items[index].item_id].inspect_value;
-
-
+                  if (inspectionsMap[items[index].item_id] == undefined) {
+                    item.value = inspectionsMap[items[index].id].inspect_value
+                  } else {
+                    item.value = inspectionsMap[items[index].item_id].inspect_value
+                  }
                 } else {
-
-                  item.value = inspectionsMap[items[index].id].inspect_value;
+                  item.value = inspectionsMap[items[index].id].inspect_value
                 }
-
-                item.value_direction = "";
+                item.value_direction = ''
                 if (item.range_type == 1) {
-
-                  var value = parseFloat(item.value);
-                  var range_min = parseFloat(item.range_min);
-                  var range_max = parseFloat(item.range_max);
+                  var value = parseFloat(item.value)
+                  var range_min = parseFloat(item.range_min)
+                  var range_max = parseFloat(item.range_max)
                   if (value < range_min) {
-                    item.value_direction = "↓";
+                    item.value_direction = '↓'
                   } else if (value > range_max) {
-                    item.value_direction = "↑";
+                    item.value_direction = '↑'
                   }
                 }
-                this.items.push(item);
-
+                this.items.push(item)
               }
-
             }
-
-
+            console.log(this.items)
           }
         })
-        .catch(v => {});
+        .catch(v => {})
       setTimeout(() => {
-        this.itemLoading = false;
-      }, 1000);
+        this.itemLoading = false
+      }, 1000)
     }
   },
   created() {
-    const id = this.$route.query && this.$route.query.id;
-    this.patientID = parseInt(id);
+    const id = this.$route.query && this.$route.query.id
+    this.patientID = parseInt(id)
     if (isNaN(this.patientID) || this.patientID <= 0) {
       this.$notify.error({
-        title: "错误",
-        message: "无效的id"
-      });
-      this.$router.push("/patients/patients");
+        title: '错误',
+        message: '无效的id'
+      })
+      this.$router.push('/patients/patients')
     }
 
-    this.fetchInspectionReference();
+    this.fetchInspectionReference()
   }
-};
+}
 </script>
 
 <style>

src/xt_pages/user/patients.vue

@@ -1102,7 +1102,7 @@
 
       },
       getCount(row) {
-        console.log(row)
+        
         return row.total_dialysis + row.user_sys_before_count
       },
       EditLapseto() {
@@ -1239,7 +1239,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
           }