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

config/dev.env.js

@@ -7,7 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API:'"http://localhost:9531"',
+  //BASE_API:'"http://localhost:9531"',
+  BASE_API:'"http://api.xt.test.sgjyun.com"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -19,8 +19,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
-    host:'localhost',
+     host: 'xt.test.sgjyun.com',
+   // host:'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/common/common.js

@@ -149,6 +149,7 @@ export function getTotalLapseCount(startime, endtime) {
     startime: startime,
     endtime: endtime
   }
+
   return request({
     url: '/com/api/gettotallapsecount',
     method: 'get',
@@ -376,12 +377,7 @@ export function getNormData(params) {
   })
 }
 
-export function getFirstQuarter(lapseto, startime, endtime) {
-  const params = {
-    lapseto: lapseto,
-    startime: startime,
-    endtime: endtime
-  }
+export function getFirstQuarter(params) {
   console.log('params', params)
   return request({
     url: '/com/api/getfirstquarter',
@@ -391,7 +387,6 @@ export function getFirstQuarter(lapseto, startime, endtime) {
 }
 
 export function getProjectList(params) {
-  console.log('params', params)
   return request({
     url: '/com/api/getprojectlist',
     method: 'get',
@@ -423,3 +418,34 @@ export function getPatientsControl(lapstor, startime, endtime, page, limit) {
   })
 }
 
+export function getCartogramlist(lapsetor, startime, endtime, limit, page) {
+  const params = {
+    lapsetor: lapsetor,
+    startime: startime,
+    endtime: endtime,
+    limit: limit,
+    page: page
+  }
+
+  return request({
+    url: '/com/api/getcartogramlist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPatientContorlAnalysis(params) {
+  return request({
+    url: '/com/api/getpatientcontor',
+    method: 'get',
+    params: params
+  })
+}
+
+export function GetQualityControl(params) {
+  return request({
+    url: '/com/api/getqualitycontrol',
+    method: 'Get',
+    params: params
+  })
+}

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

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

src/router/modules/dialysis.js

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

src/xt_pages/dialysis/bloodPresssWatch.vue

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

src/xt_pages/dialysis/details/acceptsAssessment.vue

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

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -18,9 +18,6 @@
             >{{ item.label }}</li>
           </ul>
         </div>
-        <label class="title">
-          <span class="name">日期查询</span> :
-        </label>
         <el-date-picker
           v-model="listQuery.start_time"
           prefix-icon="el-icon-date"
@@ -32,6 +29,7 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
         ></el-date-picker>
         <span class>-</span>
         <el-date-picker
@@ -45,6 +43,7 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
         ></el-date-picker>
       </div>
       <div class="cell clearfix" style="align-items:normal">
@@ -114,6 +113,22 @@
                       <p>腹水回输:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
+                   <span v-if="item.mode_id == 15">
+                      <p>HD前置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                   </span>
+                    <span v-if="item.mode_id == 16">
+                      <p>HD后置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                   </span>
+                    <span v-if="item.mode_id == 17">
+                      <p>HDF前置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                   </span>
+                    <span v-if="item.mode_id == 18">
+                      <p>HDF后置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                   </span>
                    <span v-if="item.mode_id == 19">
                       <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
@@ -165,10 +180,10 @@
                 <p class="infoTitle">转归统计(总人数{{patientCount}}人)</p>
               </div>
               <div class="borderBox1">
-                <p>留治:{{RetentionCount}}人({{(RetentionCount/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(RetentionCount/patientCount*100).toFixed(1)"></el-progress>
-                <p>转出:{{rollOut}}人({{(rollOut/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(rollOut/patientCount*100).toFixed(1)"></el-progress>
+                <p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
+                <p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
               </div>
             </div>
             <div class="infoOne">
@@ -253,8 +268,14 @@ export default {
   },
   data() {
     return {
+       pickerOptions: {
+        disabledDate(time) {
+          let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
+          return time.getTime() > Date.now() || time.getTime() < threeMonths;;
+        }
+      }, 
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "基本信息统计" }
       ],
       listQuery: {
@@ -268,7 +289,8 @@ export default {
         { value: 0, label: "本月", state: 0 },
         { value: 1, label: "近三个月", state: 1 },
         { value: 2, label: "近半年", state: 2 },
-        { value: 3, label: "近一年", state: 3 }
+        { value: 3, label: "近一年", state: 3 },
+        { value:4,label:"自定义",state:4}
       ],
       modetype:[],
       total:0,
@@ -286,6 +308,8 @@ export default {
       totalone:0,
       totaltwo:0,
       totalthree:0,
+      rollOutTotal:0,
+      outTotal:0,
     };
   },
   methods: {
@@ -294,6 +318,7 @@ export default {
       return new Date(time).getTime() / 1000;
     },
     changeTime(val) {
+       this.stateType = 4
        var timeStar=Date.parse(val)/1000
        var timeEnd =Date.parse(this.listQuery.end_time)/1000
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -316,6 +341,7 @@ export default {
       }
     },
     changeEndTime(val) {
+       this.stateType = 4
        var timeEnd=Date.parse(val)/1000
        var timeStar =Date.parse(this.listQuery.start_time)/1000
       var time =
@@ -443,6 +469,8 @@ export default {
         //统计透析年龄
         this.getTotalDialysisCount(startunitx,endunitx)
      }
+   
+ 
 
     },
     getDialysisModeType(startDate,endDate){
@@ -453,53 +481,6 @@ 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"
-           //   }
-           //}
            this.modetype = modetype
            console.log("modetype",modetype)
 
@@ -511,11 +492,13 @@ export default {
       getTotalLapseCount(startDate,endDate).then(response=>{
          if(response.data.state == 1){
           var patients =  response.data.data.patients
-          var total = response.data.data.total
-          this.rollOut = total
+          this.rollOutTotal = patients.length
+          console.log("留治病人长度",patients.length)
+          var patienttwo = response.data.data.patienttwo
+          this.outTotal = patienttwo.length
+            console.log("转出长度", this.outTotal)
           var count = response.data.data.count
           this.patientCount = count
-          this.RetentionCount = count-total
          }
       })
     },
@@ -620,7 +603,7 @@ export default {
     }
   },
   created() {
-     //获取本月当前机构的透析模式
+        //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       console.log("开始时间",startDate)
       const endDate = moment(new Date()).format('YYYY-MM-DD')

src/xt_pages/qcd/checkStatistical.vue

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

src/xt_pages/qcd/dialysisTotal.vue

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

src/xt_pages/qcd/indicatorControlAnalysis/analysis.vue

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

src/xt_pages/qcd/indicatorControlAnalysis/analysisDetails.vue

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

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -212,7 +212,7 @@ export default {
       ],
 
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "患者血压详情" }
       ],
 

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -257,7 +257,7 @@
           { value: 12, name: '超滤量' },
         ],
         crumbs: [
-          { path: false, name: '科室质控' },
+          { path: false, name: '质控管理' },
           { path: false, name: '指标评估统计' },
           { path: false, name: '透析过程指标统计' }
         ],

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -228,7 +228,7 @@
           { value: 4, name: '透后体重' },
         ],
         crumbs: [
-          { path: false, name: '科室质控' },
+          { path: false, name: '质控管理' },
           { path: false, name: '指标评估统计' },
           { path: false, name: '透析过程指标统计' }
         ],

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -217,7 +217,7 @@ export default {
       ],
 
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "患者血压详情" }
       ],
 

src/xt_pages/qcd/officesControlAnalysis/project.vue

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

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -110,13 +110,16 @@ export default {
   },
   data() {
     return {
+      modetype:0,
+      startime:"",
+      endtime:"",
       activeName: "first",
       modesData: {
         xAxis: [],
         series: []
        },
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "科室质控达标统计" },
         { path: false, name: "按时间分组" }
       ],
@@ -274,13 +277,29 @@ export default {
         this.$router.push({ path: "/qcd/officesControlAnalysis/project" });
       }
     },
-    changeTime() {},
+    changeTime(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.start_time = "";
+      } else {
+        this.getlist()
+      }
+
+    },
     changeLapseto(val){
-      console.log("val",val)
-      this.lapseto = val
-      const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
-      const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-      this.getFirstQuarter(val,firstQuarterStart,firstQuarterEnd)
+      if(val == 0){
+        this.lapseto = 0
+        this.getlist()
+      }
+      if(val == 1){
+       this.lapseto =1
+       this.getlist()
+      }
+      if(val == 2){
+        this.lapseto = 2
+        this.getlist()
+      }
     },
      
     changeEndTime(val) {
@@ -290,156 +309,268 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+        this.getlist()
       }
+    },
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     selectLapseTo(state) {
       this.stateType = state;
       this.listQuery.state = state;
     },
     chooseType(val) {
-      console.log(val);
       this.type = val;
+      if(val == "按月份对比统计"){
+         this.modetype = 0
+        
+      }
+       if(val == "按季度对比统计"){
+         this.modetype = 1
+         
+      }
+      if(val == "自定义"){
+        this.modetype = 2
+      }
+     
     },
     chooseQuarter(quarter) {
       this.quarterType = quarter;
       //第一季度
       if(quarter === 0){
-        //本月的开始时间
-        const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
-        const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,firstQuarterStart,firstQuarterEnd)
+         this.modetype = 0
+        this.getlist()
+        return false
       }
 
       //第二季度
       if(quarter === 1){
-        const febQuarterStart = moment().month(3).startOf('month').format("YYYY-MM-DD")
-        const fedQuarterEnd = moment().month(5).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,febQuarterStart,fedQuarterEnd)
+         this.modetype = 0
+         this.getlist()
+         return false
       }
 
       //第三季度
       if(quarter === 2){
-        const threeQuarterStart = moment().month(6).startOf('month').format("YYYY-MM-DD")
-        const threeQuarterEnd = moment().month(8).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,threeQuarterStart,threeQuarterEnd)
+        this.modetype = 0
+        this.getlist()
+        return false
       }
 
       //第四季度
       if(quarter === 3){
-        const fourQuarterStart = moment().month(8).startOf('month').format("YYYY-MM-DD")
-        const fourQuarterEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+       this.modetype = 0
+        this.getlist()
+        return false
       }
 
       
     },
-    chooseMonth(month) {
-      this.monthType = month;
-    
+    chooseMonth(month) {  
       //1月
       if(month == 0){
-          const fourQuarterStart = moment().month(0).startOf('month').format("YYYY-MM-DD")
-          console.log("fourQuarterStart",fourQuarterStart)
-          const fourQuarterEnd = moment().month(0).endOf('month').format("YYYY-MM-DD")
-           this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
-
+        this.modetype = 1
+         this.monthType = month;
+        this.getlist()
+         return false
       }
       //2月
       if(month == 1){
-         const fourQuarterStart = moment().month(1).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(1).endOf('month').format("YYYY-MM-DD")
-        this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+         this.modetype = 1
+          this.monthType = month;
+        this.getlist()
+        return false
       }
       //
      //3月
       if(month == 2){
-         const fourQuarterStart = moment().month(2).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+       this.modetype = 1
+        this.monthType = month;
+       this.getlist()
+       return false
       }
       //4月
        if(month == 3){
-         const fourQuarterStart = moment().month(3).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(3).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+         this.modetype = 1
+          this.monthType = month;
+         this.getlist()
+         return false
       }
       //5月
        if(month == 4){
-         const fourQuarterStart = moment().month(4).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(4).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.modetype = 1
+         this.monthType = month;
+         this.getlist()
+         return false
       }
       //6月
        if(month == 5){
-         const fourQuarterStart = moment().month(5).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(5).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+         this.modetype = 1
+          this.monthType = month;
+        this.getlist()
+        return false
       }
       //7月
        if(month == 6){
-         const fourQuarterStart = moment().month(6).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(6).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+       this.modetype = 1
+        this.getlist()
+        return false
       }
       //8月
        if(month == 7){
-         const fourQuarterStart = moment().month(7).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(7).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+        this.getlist()
+        return false
       }
       //9月
        if(month == 8){
-         const fourQuarterStart = moment().month(8).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(8).endOf('month').format("YYYY-MM-DD")
-         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+        this.getlist()
+        return false
       }
       //10月
        if(month == 9){
-         const fourQuarterStart = moment().month(9).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(9).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+        this.getlist()
+        return false
       }
       //11月
        if(month == 10){
-         const fourQuarterStart = moment().month(10).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(10).endOf('month').format("YYYY-MM-DD")
-         this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+        this.getlist()
+        return false
       }
        //12月
        if(month == 11){
-         const fourQuarterStart = moment().month(11).startOf('month').format("YYYY-MM-DD")
-         console.log("fourQuarterStart",fourQuarterStart)
-         const fourQuarterEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
-          this.getFirstQuarter(this.lapseto,fourQuarterStart,fourQuarterEnd)
+        this.monthType = month;
+        this.modetype = 1
+         this.getlist()
+         return false
       }
     },
     getNormData(){
       getNormData().then(response=>{
          if(response.data.state === 1){
            var normdata = response.data.data.normdata
-           console.log("normdata",normdata)
            this.normData = normdata
+           this.getlist()
          }
       })
     },
     //第一季度
-    getFirstQuarter(val,startime,endtime){
+    getlist(){
        this.modesData.series = []
        this.modesData.xAxis = []
-      getFirstQuarter(val,startime,endtime).then(response=>{
+         //本月的开始时间
+         //第一季度
+         if(this.modetype == 0 && this.quarterType == 0){
+            
+             this.startime =  moment().startOf('year').format('YYYY-MM-DD')
+             this.endtime = moment().month(2).endOf('month').format("YYYY-MM-DD")
+             
+         }
+         //第二季度
+         if(this.modetype ==0 && this.quarterType == 1){
+             this.startime = moment().month(3).startOf('month').format("YYYY-MM-DD")   
+             this.endtime = moment().month(5).endOf('month').format("YYYY-MM-DD")
+         }
+         //第三季度
+         if( this.modetype ==0 && this.quarterType == 2){
+           this.startime = moment().month(6).startOf('month').format("YYYY-MM-DD")
+           this.endtime = moment().month(8).endOf('month').format("YYYY-MM-DD")
+         }
+         //第四季度
+         if( this.modetype ==0 && this.quarterType == 3){
+             this.startime = moment().month(8).startOf('month').format("YYYY-MM-DD")
+             this.endtime = moment().month(11).endOf('month').format("YYYY-MM-DD")
+         }
+         
+         //1月
+         if(this.modetype == 1 && this.monthType == 0){
+          this.startime = moment().month(0).startOf('month').format("YYYY-MM-DD")
+          this.endtime = moment().month(0).endOf('month').format("YYYY-MM-DD")
+         
+         }
+         //2 月
+         if( this.modetype == 1 && this.monthType == 1){
+            this.startime = moment().month(1).startOf('month').format("YYYY-MM-DD")
+            this.endtime = moment().month(1).endOf('month').format("YYYY-MM-DD")
+         }
+          //3 月
+         if(this.modetype == 1 && this.monthType == 2){
+           this.startime = moment().month(2).startOf('month').format("YYYY-MM-DD") 
+           this.endtime = moment().month(2).endOf('month').format("YYYY-MM-DD")
+          
+         }
+          //4月
+         if(this.modetype == 1 && this.monthType == 3){
+           this.startime = moment().month(3).startOf('month').format("YYYY-MM-DD")
+           this.endtime = moment().month(3).endOf('month').format("YYYY-MM-DD")
+         }
+           //5月
+         if(this.modetype == 1 && this.monthType == 4){
+          this.startime = moment().month(4).startOf('month').format("YYYY-MM-DD")
+          this.endtime= moment().month(4).endOf('month').format("YYYY-MM-DD")
+          }
+            //6月
+         if(this.modetype == 1 && this.monthType == 5){
+           this.startime = moment().month(5).startOf('month').format("YYYY-MM-DD")
+          this.endtime = moment().month(5).endOf('month').format("YYYY-MM-DD")
+           
+         }
+            //7月
+         if(this.modetype == 1 && this.monthType == 6){
+          this.startime = moment().month(6).startOf('month').format("YYYY-MM-DD")
+          this.endtime = moment().month(6).endOf('month').format("YYYY-MM-DD")
+         }
+            //8月
+         if(this.modetype==1 && this.monthType == 7){
+            this.startime = moment().month(7).startOf('month').format("YYYY-MM-DD")
+            this.endtime = moment().month(7).endOf('month').format("YYYY-MM-DD")
+         }
+         //9月
+          if(this.modetype == 1 && this.monthType == 8){
+             this.startime = moment().month(8).startOf('month').format("YYYY-MM-DD")
+            this.endtime = moment().month(8).endOf('month').format("YYYY-MM-DD")
+            
+         }
+          //10月
+          if(this.modetype == 1 && this.monthType == 9){
+           this.startime = moment().month(9).startOf('month').format("YYYY-MM-DD")
+           this.endtime = moment().month(9).endOf('month').format("YYYY-MM-DD")
+            
+         }
+         //11月
+         if(this.modetype == 1 && this.monthType == 10){
+            this.startime = moment().month(10).startOf('month').format("YYYY-MM-DD")       
+            this.endtime = moment().month(10).endOf('month').format("YYYY-MM-DD")
+         }
+          //12月
+         if(this.modetype == 1 && this.monthType == 11){
+          
+           this.startime = moment().month(11).startOf('month').format("YYYY-MM-DD")
+           this.endtime = moment().month(11).endOf('month').format("YYYY-MM-DD")
+         }
+
+         if(this.modetype == 2){
+            this.startime = this.listQuery.start_time
+            this.endtime = this.listQuery.end_time
+         }
+        const params = {
+          lapseto:this.lapseto,
+          startime:this.startime,
+          endtime:this.endtime
+        }
+      getFirstQuarter(params).then(response=>{
          if(response.data.state === 1){
             var count =  response.data.data.count
-            console.log("count",count)
+
             var arr=[]
             for(let i=0;i<count.length;i++){  
                for(let j=0;j<this.normData.length;j++){
@@ -448,7 +579,7 @@ export default {
                 }
               }
             }
-            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)
@@ -470,7 +601,7 @@ export default {
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
-            console.log(2222,this.modesData)
+    
 
           
          }
@@ -503,19 +634,13 @@ export default {
                 result.push(obj);
             }
         }
-        console.log("result",result)
         return result;
     },
   },
   created(){
-       //本月的开始时间
-      const firstQuarterStart =  moment().startOf('year').format('YYYY-MM-DD')
-    
-      const firstQuarterEnd = moment().month(2).endOf('month').format("YYYY-MM-DD")
-     
      //获取指标正常范围值
      this.getNormData()
-     this.getFirstQuarter(this.lapseto,firstQuarterStart,firstQuarterEnd)
+    // this.getFirstQuarter(this.lapseto,firstQuarterStart,firstQuarterEnd)
   }
 };
 </script>

src/xt_pages/qcd/outcomeIndicators/control.vue

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

src/xt_pages/qcd/patientAnalysis/bloodPressure.vue

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

src/xt_pages/qcd/patientAnalysis/complication.vue

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

src/xt_pages/qcd/patientAnalysis/dialysisAge.vue

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

src/xt_pages/qcd/patientAnalysis/infectiousDiseases.vue

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

src/xt_pages/qcd/patientAnalysis/lapseto.vue

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

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

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

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

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

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

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

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

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

src/xt_pages/qcd/patientAnalysis/weight.vue

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

src/xt_pages/qcd/patientComplianceDetails.vue

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

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -77,12 +77,15 @@
               :key="index"
             >
             <template slot-scope="scope">
-              {{ scope.row.data[index].inspect_value}}
+                 <span v-if="scope.row.data[index].inspect_value == ''">0</span>
+                 <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) < parseInt(scope.row.data[index].range_min))">{{scope.row.data[index].inspect_value}}↓</span>
+                <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) > parseInt(scope.row.data[index].range_max))">{{scope.row.data[index].inspect_value}}↑</span>
+                <span v-if="scope.row.data[index].inspect_value !=''&& (parseInt(scope.row.data[index].inspect_value) >= parseInt(scope.row.data[index].range_min))&& (parseInt(scope.row.data[index].inspect_value) <= parseInt(scope.row.data[index].range_max)) ">{{scope.row.data[index].inspect_value}}</span>
             </template>
         </el-table-column>
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
-                <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+                <el-button @click="handleClick(scope.row.name)" type="text" size="small">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -109,7 +112,7 @@
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../qcd/components/LineChart";
-import { getNormData,getPatientsControl } from "@/api/common/common"
+import { getNormData,getPatientsControl,getCartogramlist,getPatientContorlAnalysis,getCurrentOrgPatients } from "@/api/common/common"
 export default {
   components: {
     LineChart,
@@ -124,7 +127,7 @@ export default {
         }
       },
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "患者质控达标统计" }
       ],
       listQuery: {
@@ -150,6 +153,10 @@ export default {
         },
       ],
       value: "",
+      modesData: {
+        xAxis: [],
+        series: []
+      },
       chart: {
         title: {
           text: "ECharts 入门示例"
@@ -178,7 +185,7 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: "{c}%"
               }
             },
             //配置样式
@@ -219,6 +226,7 @@ export default {
           }
         ]
       },
+      patientsArr:[],
       tableData: [],
       normData:[],
       paitents:[],
@@ -227,6 +235,14 @@ export default {
       ObjectData:{},
       tablePatients:[],
       tableSort:[],
+      dataName:[
+        {id:0,name:"达标"},
+        {id:1,name:"未达标"},
+      ],
+      dataCount:[
+         {id:0,count:0},
+         {id:1,count:0}
+      ]
     };
   },
   methods: {
@@ -245,7 +261,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.start_time = "";
       } else {
-
+        
       }
 
     },
@@ -256,14 +272,23 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+       
       }
     },
-  getTimestamp(time) {
+    getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
-    handleClick(row) {
-      this.$router.push({ path: "/qcd/patientComplianceDetails" });
+    handleClick(name) {
+      var id = 0
+      var dialysis_no = 0
+      for(let i=0;i<this.tablePatients.length;i++){
+         if(name == this.tablePatients[i].name){
+            id = this.tablePatients[i].patient_id
+            dialysis_no = this.tablePatients[i].dialysis_no
+         }
+      }
+      this.$router.push({ path: "/qcd/patientComplianceDetails?patientid="+id});
     },
     getDialysisNo(name){
         for(let i=0;i<this.tablePatients.length;i++){
@@ -294,21 +319,127 @@ export default {
       })
     },
     onSearch(){
+         const params = {
+            lapstor:this.lapstor,
+            keyword:this.listQuery.search,
+            startime:this.listQuery.start_time,
+            endtime:this.listQuery.end_time,
+
+         }
+         console.log("params",params)
+       getPatientContorlAnalysis(params).then(response=>{
+           if(response.data.state == 1){
+              var control = response.data.data.patientcontorDetail
+              console.log('control', control)
+              let dataInfo = {}
+              control.forEach((item, index) => {
+                let { patient_id } = item
+                if (!dataInfo[patient_id]) {
+                  dataInfo[patient_id] = {
+                    patient_id,
+                    name: item.name,
+                    child: [],
+                    inspect_date: item.inspect_date
+
+                  }
+                }
+              })
+              let list = Object.values(dataInfo)
+              // console.log('list', list)
+              list.map(item => {
+                for (let i = 0; i < control.length; i++) {
+                  if (item.inspect_date == control[i].inspect_date && item.patient_id == control[i].patient_id) {
+                    item.child.push(control[i])
+                  }
+                }
+              })
+                var newarrtwo = []
+                list.map(item => {
+                  item.child.map(it => {
+                    newarrtwo.push(it)
+                  })
+                })
+
+                // 配置的才显示
+
+                var arrthree = []
+                for (let i = 0; i < newarrtwo.length; i++) {
+                  for (let j = 0; j < this.normData.length; j++) {
+                    if (newarrtwo[i].item_id == this.normData[j].inspection_minor) {
+                      arrthree.push(newarrtwo[i])
+                    }
+                  }
+                }
+
+                var arrfour = this.arrayDate(arrthree, newarrtwo)
+                arrfour.map(item => {
+                  item.item_name = ''
+                  arrthree.push(item)
+                })
+
+                var dd = {}
+                for (const index in arrthree) {
+                  if (!(arrthree[index].name in dd)) {
+                    dd[arrthree[index].name] = {}
+                  }
+                  if (!(arrthree[index].item_name in dd[arrthree[index].name]) && arrthree[index].item_name != 0) {
+                    dd[arrthree[index].name][arrthree[index].item_name] = arrthree[index]
+                  }
+                }
+                this.tableData = []
+
+                for (const key in dd) {
+                  for (const mkey in this.ObjectData) {
+                    if (!(this.ObjectData[mkey].item_name in dd[key])) {
+                      dd[key][this.ObjectData[mkey].item_name] = {
+                        item_name: this.ObjectData[mkey].item_name,
+                        name: mkey,
+                        inspect_value: 0
+                      }
+                    }
+                  }
+                  this.tableData.push({ name: key, data: dd[key]})
+                }
+                  console.log("表格",this.tableData)
+                  let projectArr = []
+                  this.newArr.map(item => {
+                    projectArr.push(item.item_name)
+                  })
+
+                  this.tableData.map(item => {
+                    let newarr = Object.values(item.data)
+                    newarr.sort((a, b) => {
+                      return projectArr.indexOf(a.item_name) - projectArr.indexOf(b.item_name)
+                    })
+                    item.data = newarr
+                  })
+      
+                  for (let i = 0; i < this.patientsArr.length; i++) {
+                    for (let j = 0; j < this.tableData.length; j++) {
+                      if (this.patientsArr[i].name == this.tableData[j].name) {
+                        this.tableData[j].dialysis_no = this.patientsArr[i].dialysis_no
+                        this.tableData[j].patient_id = this.patientsArr[i].id
+                      }
+                    }
+                  }
+                }
+          })
     },
     getlist(){
       getPatientsControl(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state == 1){
            var patients = response.data.data.patients
-          // console.log("paitents",patients)
-          this.tablePatients = patients
-           var total =  response.data.data.total
-          // console.log("total",total)
-           this.total = total
-           var control = response.data.data.control
-         // console.log("control",control)
-          var newArr = []
-           //分页
-           for(let i=0;i<control.length;i++){
+             this.tablePatients = patients
+             var total =  response.data.data.total
+             // console.log("total",total)
+             this.total = total
+             var control = response.data.data.control
+
+
+             // console.log("control",control)
+             var newArr = []
+             //分页
+             for(let i=0;i<control.length;i++){
              for(let j=0;j<patients.length;j++){
                 if(control[i].patient_id == patients[j].patient_id){
                    newArr.push(control[i])
@@ -376,8 +507,6 @@ export default {
                dd[arrthree[index].name][arrthree[index].item_name] = arrthree[index];
             }
           }
-        console.log("ddd",dd)
-         console.log("obj",this.ObjectData)
           this.tableData= []
 
           for(const key in dd){
@@ -398,7 +527,7 @@ export default {
             this.newArr.map(item => {
               projectArr.push(item.item_name)
             })
-            console.log("projectArr",projectArr)
+           // console.log("projectArr",projectArr)
 
             this.tableData.map(item => {
             // console.log("item---",item.data)
@@ -410,9 +539,9 @@ export default {
                 return projectArr.indexOf(a.item_name)-projectArr.indexOf(b.item_name);
               });
               item.data = newarr
-              console.log(1111111111,item.data)
+             // console.log(1111111111,item.data)
             })
-              console.log("表",this.tableData)
+             console.log("表",this.tableData)
          }
       })
     },
@@ -440,9 +569,134 @@ export default {
                 result.push(obj);
             }
         }
-        console.log("result",result)
         return result;
     },
+
+    getCartogramlist(){
+       getCartogramlist(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
+           if(response.data.state == 1){
+              var cartogramlist =  response.data.data.cartogramlist
+              console.log("cartogramlist",cartogramlist)
+              var totaltwo =  response.data.data.total
+               var cart = []
+               for(let i=0;i<cartogramlist.length;i++){
+                  if(cartogramlist[i].inspect_value != ''){
+                    cart.push(cartogramlist[i])
+                  }
+               }
+               console.log("cart",cart)
+               let dataInfo = {}
+                cart.forEach((item, index) => {
+                  let { patient_id } = item
+                  if (!dataInfo[patient_id]) {
+                    dataInfo[patient_id] = {
+                      patient_id,
+                      name:item.name,
+                      child: [],
+                      inspect_date:item.inspect_date,
+                      total:0,
+                    }
+                  }
+                })
+              let list = Object.values(dataInfo)
+              console.log("list",list)
+
+              var arr = []
+              list.map(item=>{
+                 for(let i=0;i<cart.length;i++){
+                    if(item.inspect_date == cart[i].inspect_date && item.patient_id == cart[i].patient_id){
+                        item.child.push(cart[i])
+                         item.total++
+                    }
+                 }
+              })
+
+
+
+             list.map(item=>{
+                item.child.map(it=>{
+                   arr.push(it)
+                })
+             })
+              console.log("arr",arr)
+
+             var arrtwo = []
+             for(let i=0;i<arr.length;i++){
+               if(parseInt(arr[i].range_min)<= parseInt(arr[i].inspect_value) && parseInt(arr[i].inspect_value)<=parseInt(arr[i].range_max )){
+                  arrtwo.push(arr[i])
+               }
+             }
+             console.log("arrtwo",arrtwo)
+
+             let objinfo = {}
+                arrtwo.forEach((item, index) => {
+                  let { patient_id } = item
+                  if (!objinfo[patient_id]) {
+                    objinfo[patient_id] = {
+                      patient_id,
+                      name:item.name,
+                      child: [],
+                      inspect_date:item.inspect_date,
+                      count:0,
+                    }
+                  }
+                })
+              let newlist = Object.values(objinfo)
+              newlist.map(item=>{
+                 for(let i=0;i<arrtwo.length;i++){
+                    if(arrtwo[i].patient_id == item.patient_id && arrtwo[i].inspect_date == item.inspect_date){
+                       item.child.push(arrtwo[i])
+                    }
+                 }
+              })
+              console.log("newlist",newlist)
+              newlist.map(item=>{
+                  item.child.map(it=>{
+                    if(parseInt(it.range_min)<= parseInt(it.inspect_value) && parseInt(it.inspect_value)<=parseInt(it.range_max )){
+                       item.count ++
+                    }
+                  })
+              })
+              console.log("newlist",newlist)
+
+
+              var newtotal = 0
+
+              list.map(item=>{
+                 for(let i=0;i<newlist.length;i++){
+                    if(item.patient_id == newlist[i].patient_id && item.total == newlist[i].count){
+                       newtotal ++
+                    }
+                 }
+              })
+             console.log("newtotal",newtotal)
+             var totalCount = totaltwo - newtotal
+              console.log("totalCount",totaltwo)
+             for(let i=0;i<this.dataName.length;i++){
+                this.modesData.xAxis.push(this.dataName[i].name);
+             }
+
+             for(let i=0;i<this.dataCount.length;i++){
+                this.dataCount[0].count = newtotal
+                this.dataCount[1].count =  totalCount
+             }
+
+             for(let i=0;i<this.dataCount.length;i++){
+                this.modesData.series.push(((this.dataCount[i].count/totaltwo)*100).toFixed(1));
+             }
+              this.chart.series[0].data = this.modesData.series
+              this.chart.xAxis.data = this.modesData.xAxis
+           }
+       })
+    },
+     getCurrentOrgPatients(){
+       getCurrentOrgPatients().then(response=>{
+          if(response.data.state == 1){
+            this.patientsArr =  response.data.data.patients
+          }
+       })
+     }
+
   },
   created(){
     var nowDate = new Date();
@@ -466,10 +720,17 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
+
+
+
     //获取系统指标
     this.getNormData()
     //获取列表数据
     this.getlist()
+    //获取统计图数据
+    this.getCartogramlist()
+
+    this.getCurrentOrgPatients()
   }
 };
 </script>

src/xt_pages/qcd/processIndicators.vue

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

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -74,7 +74,7 @@
                 </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="指控范围" :label-width="formLabelWidth" required prop="large_range">
+          <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
             <el-input style="width:200px" v-model="form.min_range"></el-input>&nbsp;
             -
             <el-input style="width:200px" v-model="form.large_range"></el-input>
@@ -115,7 +115,7 @@
                 </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="指控范围" :label-width="formLabelWidth" required prop="large_range">
+          <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
             <el-input style="width:200px" v-model="editform.min_range"></el-input>&nbsp;
             -
             <el-input style="width:200px" v-model="editform.large_range"></el-input>
@@ -146,7 +146,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "统计配置" },
         { path: false, name: "质控达标统计配置" }
       ],
@@ -176,7 +176,7 @@ export default {
       rules: {
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
-        large_range:[{required:true,message:"指控范围不能为空"}]
+        large_range:[{required:true,message:"质控范围不能为空"}]
       },
       page:1,
       limit:10,
@@ -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
         }
       })
@@ -242,12 +242,12 @@ export default {
         }
       })
     },
-    // 获取指控范围
+    // 获取质控范围
     changeInspectionMonior(id){
        getInspectionRange(id).then(response=>{
          if(response.data.state == 1){
            var inspectionRange =  response.data.data.inspectionRange
-          // console.log("inspectionRange",inspectionRange)
+          console.log("inspectionRange",inspectionRange)
            this.form.min_range = inspectionRange.range_min
            this.form.large_range = inspectionRange.range_max
          }

src/xt_pages/qcd/treatmentControlAnalysis.vue

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

src/xt_pages/qcd/treatmentControlAnalysis/check.vue

@@ -50,7 +50,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "治疗信息统计" },
         { path: false, name: "患者透析次数统计" }
       ],

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

@@ -148,7 +148,7 @@ export default {
             // obj.name = val.name
             // obj.data = arr
             // this.tableData.push(obj)
-            console.log("arr",arr)
+        
           }
       })
     },
@@ -184,16 +184,16 @@ export default {
       getAllMajorInspection().then(response=>{
         if(response.data.state === 1){
            var inspection = response.data.data.inspection
-           console.log("inspection",inspection)
+        
            var a=[];
            for(let i=0;i<inspection.length;i++){
              a.push(inspection[i])
            }
-           console.log("a",a)
+
            this.newArr = a
            var arr = this.arrayToObj(a)
            
-           console.log("arr",arr)
+      
            this.ObjectData = arr
            this.tableName = inspection
         }
@@ -203,13 +203,13 @@ export default {
       getPatientList(this.listQuery.start_time,this.listQuery.end_time,this.listQuery.limit,this.listQuery.page).then(response=>{
          if(response.data.state === 1){
            var patientInfo = response.data.data.patientInfo
-           console.log("列表数据2",patientInfo)
+          
 
            var total = response.data.data.total
-           console.log("total",total)
+        
            this.total = total
           var list = response.data.data.list
-          console.log("list",list)
+       
           var dtd = []
           for(let i=0;i<list.length;i++){
               for(let j=0;j<this.tableName.length;j++){
@@ -218,7 +218,7 @@ export default {
                   }
               }
           }
-          console.log("dtd",dtd)
+   
           var dd = {};
            for (const index in dtd) {
             if (!(dtd[index].name in dd)) {
@@ -228,8 +228,7 @@ export default {
               dd[dtd[index].name][dtd[index].ProjectName] = dtd[index];
             }
           }
-          console.log("ddd",dd)
-           console.log("this.ObjectData",this.ObjectData)
+       
            
             for(const key in dd){
               for(const mkey in this.ObjectData){
@@ -243,16 +242,16 @@ export default {
               }
               this.tableData.push({ name: key, data: dd[key]});
             }
-            console.log("表",this.tableData)
+       
             let projectArr = []
           
             this.newArr.map(item => {
               projectArr.push(item.project_name)
             })
-            console.log("projectArr",projectArr)
+      
             this.tableData.map(item => {
               let arr = Object.values(item.data);
-             console.log("arr",arr)
+       
               arr.sort((a,b)=>{
                 return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);
               });
@@ -265,7 +264,7 @@ export default {
       getPatientDetailCheck(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var checkDetail =  response.data.data.checkDetail
-            console.log("checkDetail",checkDetail)
+        
             var arr = []
             for(let i=0;i<checkDetail.length;i++){
               for(let j=0;j<this.tableName.length;j++){
@@ -274,11 +273,11 @@ export default {
                  }
               }
             }
+
             let projectArr = []
             this.newArr.map(item => {
               projectArr.push(item.project_name)
             })
-            console.log("projectArr",projectArr)
             projectArr.forEach((item,index) => {
               if(!(arr[index] && item == arr[index].ProjectName)){
                 arr.splice(index,0,{Count:0, ProjectName: item,name: val.name})
@@ -290,7 +289,7 @@ export default {
             obj.data = arr
             this.tableData.push(obj)
             this.total = 1
-            console.log("arr",this.tableData)
+           
           }
       })
     },

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

@@ -216,11 +216,11 @@ export default {
       getInspectionTotalCount(this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var Inspection = response.data.data.Inspection
-            console.log("Inspection",Inspection)
+     
             this.tableData = Inspection
           
             var counts = response.data.data.counts
-            console.log("counts",counts)
+         
             var arr = []
             for(let i=0;i<Inspection.length;i++){
                for(let j=0;j<counts.length;j++){
@@ -229,9 +229,9 @@ export default {
                  }
                }
             }
-             console.log("arr",arr)
+          
              var arrtwo =  this.arrayDate(counts,this.normData)
-             console.log("arrtwo",arrtwo)
+            
             var hash = {};
             var i = 0;
             var res = [];
@@ -248,7 +248,7 @@ export default {
             res.map(item => {
              item.Count = eval(item.Count.join('+'))
             })
-            console.log(11111,res)
+           
             let arr1 = []
             this.tableData.map(it => {
               arr1.push(it.project_name)
@@ -279,7 +279,6 @@ export default {
             
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
-            console.log(2222,this.modesData)
           }
       })
     },
@@ -291,7 +290,7 @@ export default {
        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++){
@@ -300,10 +299,10 @@ export default {
                  }
               }
             }
-            console.log("arr",arr)
+            
            let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
            let day = parseInt(time / (1000 * 60 * 60 * 24))
-           console.log("time",parseInt(time / (1000 * 60 * 60 * 24)))
+       
             for (const key in this.tableData) {
               this.modesData.xAxis.push(this.tableData[key].project_name);
               if (key in arr) {
@@ -326,7 +325,7 @@ export default {
       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++){
@@ -335,7 +334,7 @@ export default {
                  }
              }
            }
-           console.log("arr",arr)
+       
          }
       })
     },
@@ -359,7 +358,6 @@ export default {
                 result.push(obj);
             }
         }
-        console.log("result",result)
         return result;
     },
   },

src/xt_pages/qcd/treatmentControlAnalysis/time.vue

@@ -50,7 +50,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "治疗信息统计" },
         { path: false, name: "患者透析次数统计" }
       ],

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -159,7 +159,7 @@ export default {
         {value:3, name:"抢救记录"}
       ],
       crumbs: [
-        { path: false, name: "科室质控" },
+        { path: false, name: "质控管理" },
         { path: false, name: "工作量分析统计" },
         { path: false, name: "医生" }
       ],

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -203,7 +203,7 @@
           {value:4, name:"宣教/小结"},
         ],
         crumbs: [
-          { path: false, name: "科室质控" },
+          { path: false, name: "质控管理" },
           { path: false, name: "工作量分析统计" },
           { path: false, name: "医生" }
         ],

src/xt_pages/statistics/index.vue

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

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-   store.dispatch('VerifyConfigList', []).then(() => {
-     next()
-  })
-  }
-  if (store.getters.permission_routers === undefined) {
-   store.dispatch('xt_GenerateRoutes', []).then(() => {
-     next()
-   })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //  store.dispatch('VerifyConfigList', []).then(() => {
+  //    next()
+  // })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //  store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //    next()
+  //  })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
 
   NProgress.start();