Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/qcd.js

@@ -55,4 +55,25 @@ export function GetPABloodPressureData(params) {
     method: 'get',
     params: params
   })
+}
+export function GetPAComplicationData(params) {
+  return request({
+    url: '/api/qcd/pacomplicationdata',
+    method: 'get',
+    params: params
+  })
+}
+export function GetPAInfectiousDiseasesData(params) {
+  return request({
+    url: '/api/qcd/painfectiousdiseasesdata',
+    method: 'get',
+    params: params
+  })
+}
+export function GetPersonLapsetoData(params) {
+  return request({
+    url: '/api/qcd/papersonlapsetdata',
+    method: 'get',
+    params: params
+  })
 }

src/styles/index.scss

@@ -452,4 +452,8 @@ code {
   top: 50% !important;
   transform: translate(-50%,-50%) !important;
   margin-top: 0 !important; 
+}
+
+.el-message{
+  z-index: 2004!important;
 }

src/xt_pages/data/druguse.vue

@@ -88,13 +88,15 @@
               :model="templateForm"
               label-width="90px"
             >
-              <el-form-item label="医嘱名称 :" required prop="advice_name">
-                <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
-              </el-form-item>
+              <el-row>
+               <el-col :span="12">
+                  <el-form-item label="医嘱名称 :" required prop="advice_name">
+                    <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
+                  </el-form-item>
+               </el-col> 
               <!-- <el-form-item label="医嘱内容 :" prop="advice_desc">
                 <el-input v-model="templateForm.advice_desc" style="width:50%"></el-input>
               </el-form-item> -->
-              <el-row>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
                     <el-col :span="8">
@@ -119,6 +121,8 @@
                     </el-col>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
                     <el-col :span="8">
@@ -143,8 +147,6 @@
                     </el-col>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
                 <el-col :span="12">
                   <el-form-item label="给药途径 :" prop="delivery_way">
                     <el-select
@@ -164,6 +166,8 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>  
                 <el-col :span="12">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select

src/xt_pages/data/druguseTemplate.vue

@@ -234,13 +234,12 @@
 
               <el-row>
                 <el-col :span="12">
-                  <el-form-item :label="advice_content_name" required prop="advice_name">
+                  <el-form-item label="医嘱内容 :" required prop="advice_name">
                     <el-input v-model="templateForm.advice_name"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-
-                  <el-form-item label="规格" prop="advice_desc">
+                  <el-form-item label="规格 :" required prop="advice_desc">
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
 
@@ -270,10 +269,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.single_dose_unit"
@@ -294,10 +293,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.prescribing_number_unit"
@@ -324,7 +323,7 @@
                       clearable
                       allow-create
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in drugways"
@@ -335,9 +334,6 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
                 <el-col :span="12" v-if="!isAddChild">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -346,7 +342,7 @@
                       allow-create
                       filterable
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in executionFrequencyOptions"
@@ -386,7 +382,7 @@
                     <el-col :span="8">
                       <el-input v-model="templateFormEdit.drug_spec"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.drug_spec_unit"
@@ -407,10 +403,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateFormEdit.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.single_dose_unit"
@@ -431,10 +427,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateFormEdit.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateFormEdit.prescribing_number_unit"
@@ -472,9 +468,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
+             
                 <el-col :span="12" v-if="templateFormEdit.parent_id == 0">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -569,20 +563,21 @@
               :model="templateForm"
               label-width="90px"
             >
-              <el-form-item label="医嘱内容 :" required prop="advice_name">
-                <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
-              </el-form-item>
-
               <el-row>
+                <el-col :span="12">
+                  <el-form-item label="医嘱内容 :" required prop="advice_name">
+                    <el-input v-model="templateForm.advice_name" ></el-input> 
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="规格 :" required prop="advice_desc">
                     <el-input v-model="templateForm.advice_desc"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label="药品规格 :" prop="drug_spec">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.drug_spec"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.drug_spec_unit"
@@ -603,10 +598,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="单次用量 :" prop="single_dose">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.single_dose"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.single_dose_unit"
@@ -627,10 +622,10 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="开药数量 :" prop="prescribing_number">
-                    <el-col :span="8">
+                    <el-col :span="9">
                       <el-input v-model="templateForm.prescribing_number"></el-input>
                     </el-col>
-                    <el-col class="line" :span="2">&nbsp;</el-col>
+                    <el-col class="line" :span="1">&nbsp;</el-col>
                     <el-col :span="14">
                       <el-select
                         v-model="templateForm.prescribing_number_unit"
@@ -657,7 +652,7 @@
                       clearable
                       allow-create
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in drugways"
@@ -668,9 +663,6 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-
                 <el-col :span="12">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -679,7 +671,7 @@
                       allow-create
                       filterable
                       placeholder="请选择(输入可搜索)"
-                      style="width:90%"
+                      style="width:100%"
                     >
                       <el-option
                         v-for="item in executionFrequencyOptions"

src/xt_pages/qcd/patientAnalysis/complication.vue

@@ -73,7 +73,8 @@
       <el-row :gutter="32">
         <el-col :xs="24" :sm="24" :lg="24">
           <div class="chart-wrapper">
-              <pie-chart title="" :options="CompletionOptions"/>
+              <!-- <pie-chart :title="peiTitle" :options="CompletionOptions"/> -->
+              <bar-chart :title="peiTitle" :options="CompletionOptions" />
           </div>
         </el-col>
       </el-row>
@@ -90,18 +91,26 @@
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
         
-        <el-table-column  label="日期" min-width="80" property="created_time" align="center">
-          <template slot-scope="scope"><span>{{getTime(scope.row.created_time,'{y}-{m}-{d}')}}</span></template>
+        <el-table-column  label="透析日期" min-width="80" property="created_time" align="center">
+          <template slot-scope="scope"><span>{{getTime(scope.row.schedule_date,'{y}-{m}-{d}')}}</span></template>
         </el-table-column>
-        <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
+        <el-table-column  label="透析号" min-width="100" property="patient" align="center">
+          <template slot-scope="scope"><span>{{scope.row.patient.dialysis_no}}</span></template>
         </el-table-column>
-        <el-table-column  label="姓名" min-width="100" property="name" align="center">
+        <el-table-column  label="姓名" min-width="100" property="patient" align="center">
+          <template slot-scope="scope"><span>{{scope.row.patient.name}}</span></template>
         </el-table-column>
-        <el-table-column  label="患者来源" min-width="80" property="source" align="center">
-          <template slot-scope="scope"><span>{{getPatientSource(scope.row.source)}}</span></template>
+        <el-table-column  label="性别" min-width="80" property="patient" align="center">
+          <template slot-scope="scope"><span>{{getPatientGender(scope.row.patient.gender)}}</span></template>
         </el-table-column>
-        <el-table-column  label="归转状态" min-width="80" property="lapseto" align="center">
-          <template slot-scope="scope"><span>{{getPatientLapseto(scope.row.lapseto)}}</span></template>
+        <el-table-column  label="年龄" min-width="80" property="patient" align="center">
+          <template slot-scope="scope"><span>{{tranAge(scope.row.patient.birthday)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="透前症状" min-width="80" property="assessment_before_dislysis" align="center">
+          <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.complication:'--'}}</span></template>
+        </el-table-column>
+        <el-table-column  label="透后症状" min-width="80" property="assessment_after_dislysis" align="center">
+          <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis?scope.row.assessment_after_dislysis.complication:'--'}}</span></template>
         </el-table-column>
         
       </el-table>
@@ -126,8 +135,8 @@
 
 
 <script>
-import { GetPATotalData  } from "@/api/qcd";
-import PieChart from '../components/PieChart'
+import { GetPAComplicationData  } from "@/api/qcd";
+import BarChart from "../components/BarChart";
 import {jsGetAge, uParseTime} from "@/utils/tools";
 import analysisNav from './components/analysisNav'
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
@@ -148,8 +157,13 @@ export default {
         page: 1,
         limit: 10,
       },
-      CompletionOptions:{
-        legend:[],
+      peiTitle:'透前评估（人次）',
+      // CompletionOptions:{
+      //   legend:[],
+      //   series:[],
+      // },
+      CompletionOptions: {
+        xAxis:[],
         series:[],
       },
       tableData: [],
@@ -190,35 +204,33 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.listQuery.statistical_state = this.statisticalState;
     this.getList();
   },
   methods: {
     getList() {
-      GetPATotalData(this.listQuery).then(response => {
+      GetPAComplicationData(this.listQuery).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
             this.tableData = [];
             this.total = response.data.data.total;
-            var patients = response.data.data.patients;
-            for (const index in patients) {
-                this.tableData.push(patients[index]);
+            var complications = response.data.data.complications;
+            for (const index in complications) {
+                this.tableData.push(complications[index]);
             }
-            var lapsetoIn = response.data.data.lapsetoIn;
-            var lapsetoOut = response.data.data.lapsetoOut;
+            
             this.CompletionOptions = {
-                legend:[],
-                series:[],
+              xAxis:[],
+              series:[],
             };
-            this.CompletionOptions.legend.push('留治病人');
-            this.CompletionOptions.series.push({
-                value:lapsetoIn,name:'留治病人'
-            });
-            this.CompletionOptions.legend.push('转出病人');
-            this.CompletionOptions.series.push({
-                value:lapsetoOut,name:'转出病人'
-            });
+            
+            var pcps = response.data.data.pcps;
+            for (const index in pcps) {
+              this.CompletionOptions.xAxis.push(pcps[index].name);
+              this.CompletionOptions.series.push( pcps[index].count);
+            }
         }
       });
     },
@@ -242,6 +254,11 @@ export default {
     selectStatisticalState(state) {
       this.statisticalState = state;
       this.listQuery.statistical_state = state;
+      if (state==1) {
+        this.peiTitle = '透前评估（人次）'
+      }else {
+        this.peiTitle = '透后评估（人次）'
+      }
       this.getList();
     },
     selectAge(age) {
@@ -307,7 +324,7 @@ export default {
   },
   components: {
       analysisNav,
-      PieChart,
+      BarChart,
       BreadCrumb
   }
 };

src/xt_pages/qcd/patientAnalysis/components/analysisNav.vue

@@ -6,6 +6,7 @@
         <el-tab-pane label="透析龄分析" name="dialysisage"></el-tab-pane>
         <el-tab-pane label="转归分析" name="lapseto"></el-tab-pane>
         <el-tab-pane label="并发症分析" name="complication"></el-tab-pane>
+        <el-tab-pane label="传染病分析" name="infectiousdiseases"></el-tab-pane>
     </el-tabs>
 </template>
 <script>

src/xt_pages/qcd/patientAnalysis/infectiousDiseases.vue

@@ -0,0 +1,460 @@
+<template>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container" id="outcome-indicators-query">
+      <analysis-nav activeName="infectiousdiseases"></analysis-nav>
+
+      <!-- <div class="cell">
+        <label class="title">
+          <span class="name">日期查询</span> :
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+        <span class>-</span>
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+      </div> -->
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">转归状态</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.lapseto==lapsetoType?'active':''"
+              @click="selectLapseTo( item.lapseto)"
+              v-for="item in lapsetoState"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">年龄</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.age==ageType?'active':''"
+              @click="selectAge( item.age)"
+              v-for="item in ageOptions"
+              :key="item.value"
+            >{{item.label}}</li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">传染病</span> :
+        </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id==contagionType?'active':''"
+              @click="selectContagionType( item.id)"
+              v-for="item in contagionList"
+              :key="item.id"
+            >{{item.name}}</li>
+          </ul>
+        </div>
+      </div>
+
+      <h4 class="hui">统计图</h4>
+      <hr class="huixiao">
+      <el-row :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+             &nbsp;
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+              <!-- <pie-chart :title="peiTitle" :options="CompletionOptions"/> -->
+              <bar-chart :title="peiTitle" :options="CompletionOptions" />
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8">
+          <div class="chart-wrapper">
+             &nbsp;
+          </div>
+        </el-col>
+      </el-row>
+
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column  label="透析号" min-width="100" property="dialysis_no" align="center">
+        </el-table-column>
+        <el-table-column  label="患者姓名" min-width="100" property="name" align="center">
+        </el-table-column>
+        <el-table-column  label="性别" min-width="80" property="gender" align="center">
+          <template slot-scope="scope"><span>{{getPatientGender(scope.row.gender)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="年龄" min-width="80" property="birthday" align="center">
+          <template slot-scope="scope"><span>{{tranAge(scope.row.birthday)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="归转状态" min-width="80" property="lapseto" align="center">
+          <template slot-scope="scope"><span>{{getPatientLapseto(scope.row.lapseto)}}</span></template>
+        </el-table-column>
+        <el-table-column  label="传染病" min-width="80" property="lapseto" align="center">
+          <template slot-scope="scope"><span>{{getPatientInfectiousDiseases(scope.row.contagions)}}</span></template>
+        </el-table-column>
+        
+      </el-table>
+
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
+
+      <el-pagination
+      align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+
+<script>
+import { GetPAInfectiousDiseasesData  } from "@/api/qcd";
+import BarChart from "../components/BarChart";
+import {jsGetAge, uParseTime} from "@/utils/tools";
+import analysisNav from './components/analysisNav'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  name: "totalAnalysis",
+  data() {
+    return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'患者分析'},
+        {path:false, name:'并发症分析'},
+      ],
+      total: 0,
+      patientMap:{},
+      listQuery: {
+        start_time: "",
+        end_time: "",
+        page: 1,
+        limit: 10,
+      },
+      peiTitle:'传染病（人）',
+      // CompletionOptions:{
+      //   legend:[],
+      //   series:[],
+      // },
+      CompletionOptions: {
+        xAxis:[],
+        series:[],
+      },
+      tableData: [],
+      lapsetoType: 0,
+      lapsetoState: [
+        { value: 0, label: "全部", source: 0, lapseto: 0 },
+        { value: 1, label: "转出", source: 0, lapseto: 2 },
+        { value: 2, label: "留治", source: 0, lapseto: 1 }
+      ],
+      ageType: 0,
+      ageOptions: [
+        { value: 0, label: "全部", age: 0 },
+        { value: 1, label: "20～30", age: 1 },
+        { value: 2, label: "30～40", age: 2 },
+        { value: 3, label: "40～50", age: 3 },
+        { value: 4, label: "其他", age: 4 },
+      ],
+      contagionType: 0,
+      contagionList:[
+        { id: 0, name: "全部",  },
+      ],
+      contagionMap:{},
+    };
+  },
+  created() {
+    var contagionList = this.$store.getters.contagions;
+    for (const index in contagionList) {
+      if(contagionList[index].type==2) {
+        this.contagionList.push(contagionList[index]);
+        this.contagionMap[contagionList[index].id] = contagionList[index].name;
+      }
+    }
+    
+    // var nowDate = new Date();
+    // var nowYear = nowDate.getFullYear();
+    // var nowMonth = nowDate.getMonth() + 1;
+    // var nowDay = nowDate.getDate();
+    // this.listQuery.end_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    // nowDate.setMonth(nowDate.getMonth() - 3);
+    // nowYear = nowDate.getFullYear();
+    // nowMonth = nowDate.getMonth() + 1;
+    // nowDay = nowDate.getDate();
+    // this.listQuery.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.getList();
+  },
+  methods: {
+    getList() {
+      GetPAInfectiousDiseasesData(this.listQuery).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+            this.tableData = [];
+            this.total = response.data.data.total;
+            var patients = response.data.data.patients;
+            for (const index in patients) {
+                this.tableData.push(patients[index]);
+            }
+            
+            this.CompletionOptions = {
+              xAxis:[],
+              series:[],
+            };
+            
+            var dsp = response.data.data.dsp;
+            var dspMap = {};
+            for (const index in dsp) {
+              dspMap[dsp[index].diseases] = dsp[index].count;
+            }
+            
+            for (const key in this.contagionMap) {
+              this.CompletionOptions.xAxis.push(this.contagionMap[key]);
+              if (key in dspMap) {
+                this.CompletionOptions.series.push(dspMap[key]);
+              }else {
+                this.CompletionOptions.series.push(0);
+              }
+            }
+        }
+      });
+    },
+    changeTime() {
+      this.getList();
+    },
+    onSearch(){
+      this.getList();
+    },
+    changeModel() {
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.listQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    selectAge(age) {
+      this.ageType = age;
+      this.listQuery.age = age;
+      this.getList();
+    },
+    selectLapseTo(lapseto) {
+      this.lapsetoType = lapseto;
+      this.listQuery.lapseto = lapseto;
+      this.getList();
+    },
+    selectContagionType(type) {
+      this.contagionType = type;
+      this.listQuery.contagion_type = type;
+      this.getList();
+    },
+    getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ""
+    },
+    getProjectName(id) {
+      return (id in this.projectOptions) ? this.projectOptions[id].project_name:'';
+    },
+    getPatientName(id) {
+      return (id in this.patientMap) ? this.patientMap[id].name:'';
+    },
+    getPatientLapseto(lapseto) {
+      if(lapseto==1) {
+        return '留治';
+      }else if(lapseto == 2) {
+        return '转出';
+      }
+      return '--';
+    },
+    getPatientInfectiousDiseases(cs) {
+      if (typeof(cs) == 'undefined') {
+        return '';
+      }
+      var arr = [];
+      var s = ''
+      for (const key in cs) {
+        console.log('const key in cs', cs[key]);
+        if (typeof(cs[key].disease_id) == "undefined") {
+          continue;
+        }
+        var id = cs[key].disease_id;
+        if(id in this.contagionMap) {
+          arr.push(this.contagionMap[id]);
+        }
+        s = arr.join(',');
+      }
+      return s;
+    },
+    getPatientSource(srouce){
+      if(srouce==1) {
+        return '门诊';
+      }else if(srouce == 2) {
+        return '住院';
+      }
+      return '其他';
+    },
+    getPatientGender(gender) {
+      if (gender == 1) {
+        return '男';
+      } else if(gender == 2) {
+        return '女';
+      }
+      return '';
+    },
+    tranAge(birthday) {
+        var birth = uParseTime(birthday, '{y}-{m}-{d}');
+        return jsGetAge(birth, '-');
+    },
+    getPatientDialysisNo(id) {
+      return (id in this.patientMap) ? this.patientMap[id].dialysis_no:'';
+    },
+    getItemVulue(project_id, item_id, row) {
+        var key = project_id + '_' + item_id;
+        return (typeof(row.items) !== 'undefined' && (key in row.items)) ? row.items[key].inspect_value:'';
+    },
+    renderheader(h, { column, $index }) {
+        return h('span', {}, [
+            h('span', {}, column.label.split('//')[0]),
+            h('br'),
+            h('span', {}, column.label.split('//')[1])
+        ])
+    },
+  },
+  components: {
+      analysisNav,
+      BarChart,
+      BreadCrumb
+  }
+};
+</script>
+<style>
+#oictable ::-webkit-scrollbar {
+  height: 15px;
+}
+#outcome-indicators-query .el-form-item {
+    margin-bottom: 0px !important;
+}
+</style>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container {
+//   margin: 20px;
+  font-size: 15px;
+  .filter-container {
+    padding-bottom: 5px;
+  }
+  .hui {
+    color: #909399;
+    margin-bottom: 5px;
+  }
+  .huixiao {
+    border: solid 1px #ebeef5;
+  }
+  .search-component {
+    width: 500px;
+    .searchBox {
+      width: 300px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 15px;
+      border: 1px #dcdfe6 solid;
+      border-right: none;
+      outline: none;
+      float: left;
+      border-radius: 6px 0 0 6px;
+      font-size: 14px;
+      color: #333;
+      background: #fff;
+      box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
+    }
+    .searchBtn {
+      background-color: #409eff;
+      color: #fff;
+      font-size: 15px;
+      text-align: center;
+      height: 36px;
+      line-height: 36px;
+      float: left;
+      outline: none;
+      width: 70px;
+      border: none;
+      border-radius: 0 6px 6px 0;
+      font-family: "Microsoft Yahei";
+      cursor: pointer;
+    }
+  }
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+    span {
+      color: #ef2525;
+      font-family: "Arial";
+      padding: 0 2px;
+    }
+  }
+}
+</style>

src/xt_pages/qcd/patientAnalysis/lapseto.vue

@@ -118,6 +118,13 @@
         <el-table-column  label="归转状态" min-width="80" property="lapseto" align="center">
           <template slot-scope="scope"><span>{{getPatientLapseto(scope.row.lapseto)}}</span></template>
         </el-table-column>
+        <el-table-column  label="统计" min-width="80" property="id" align="center">
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="统计" placement="top">
+              <el-button type="primary" icon="el-icon-share" size="small" @click="OpenPage(scope.row.id)"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         
       </el-table>
 
@@ -216,6 +223,9 @@ export default {
     this.getList();
   },
   methods: {
+    OpenPage(id) {
+      this.$router.push({ path: "/qcd/pa/person/lapseto?id="+id });
+    },
     getList() {
       GetPATotalData(this.listQuery).then(response => {
         if (response.data.state == 0) {

src/xt_pages/qcd/patientAnalysis/person/components/personInfo.vue

@@ -0,0 +1,67 @@
+<template>
+    <div class="patient-info-container ">
+      <span class="patient-info">姓名：{{patientInfo.name}} &nbsp;&nbsp; 性别：{{tranSex(patientInfo.gender)}} &nbsp;&nbsp; 年龄：{{tranAge(patientInfo.birthday)}} &nbsp;&nbsp; 透析号：{{patientInfo.dialysis_no}} </span>
+    </div>
+</template>
+
+<script>
+import {jsGetAge, uParseTime} from "@/utils/tools";
+export default {
+    name:'persionInfo',
+    data(){
+        return {
+            patientInfo:{
+                name:'',
+                gender:0,
+                birthday:0,
+                dialysis_no:'',
+            },
+        }
+    },
+    props:{
+        patient:{
+            type:Object,
+            default: function () {
+                return {};
+            }
+        }
+    },
+    created(){
+        // this.patientInfo = this.patient;
+    },
+    watch:{
+        "patient":function(){
+            if (typeof(this.patient.id) != 'undefined') {
+                this.patientInfo = this.patient;
+            }
+        }
+    },
+    methods:{
+      tranAge(birthday) {
+        var birth = uParseTime(birthday, '{y}-{m}-{d}');
+        return jsGetAge(birth, '-');
+      },
+      tranSex(gender) {
+        var sex = "未知";
+        switch (gender) {
+          case 1:
+            sex = "男"
+            break;
+          case 2:
+            sex = "女"
+            break;
+          default:
+            break;
+        }
+        return sex;
+      }
+    },
+}
+</script>
+<style scoped>
+.patient-info-container .patient-info {
+    font-size: 20px;
+    font-weight: bold;
+}
+</style>
+

src/xt_pages/qcd/patientAnalysis/person/components/personNav.vue

@@ -0,0 +1,29 @@
+<template>
+    <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
+        <el-tab-pane label="转归" name="lapseto"></el-tab-pane>
+    </el-tabs>
+</template>
+<script>
+export default {
+    props:{
+        activeName:{
+            type:String,
+            default: 'total'
+        }
+    },
+    data(){
+        return{
+            tabActiveName:'total',
+        }
+    }, 
+    methods:{
+        handleTabClick(tab, event) {
+            this.$router.push({ path: "/qcd/patientanalysis/"+this.tabActiveName });
+        }
+    },
+    created(){
+        this.tabActiveName = this.activeName
+    },
+}
+</script>
+

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

@@ -0,0 +1,258 @@
+<template>
+ <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container" id="outcome-indicators-query">
+      <person-info :patient="patientInfo"></person-info>
+      <person-nav activeName="lapseto"></person-nav>
+
+      <h4 class="hui">统计表</h4>
+      <hr class="huixiao">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;margin-top: 10px;"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+      >
+        
+        <el-table-column  label="时间" min-width="80" property="lapseto_time" align="center">
+          <template slot-scope="scope"><span>{{getTime(scope.row.lapseto_time,'{y}-{m}-{d} {h}:{i}')}}</span></template>
+        </el-table-column>
+        <el-table-column  label="归转状态" min-width="80" property="lapseto_type" align="center">
+          <template slot-scope="scope"><span>{{getPatientLapseto(scope.row.lapseto_type)}}</span></template>
+        </el-table-column>
+        
+      </el-table>
+
+      <!-- <pagi-nation title="分页"></pagi-nation> -->
+
+      <el-pagination
+      align="right"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="listQuery.pate"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+
+<script>
+import { GetPersonLapsetoData  } from "@/api/qcd";
+import {jsGetAge, uParseTime} from "@/utils/tools";
+import personNav from './components/personNav'
+import personInfo from './components/personInfo'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  name: "totalAnalysis",
+  data() {
+    return {
+      crumbs:[
+        {path:false, name:'科室质控'},
+        {path:false, name:'患者分析'},
+        {path:false, name:'统计'},
+        {path:false, name:'转归'},
+      ],
+      total: 0,
+      patientMap:{},
+      listQuery: {
+        page: 1,
+        limit: 10,
+      },
+      CompletionOptions:{
+        legend:[],
+        series:[],
+      },
+      tableData: [],
+      patientInfo:null,
+      patientID:0,
+    };
+  },
+  created() {
+    var patientID = this.$route.query && this.$route.query.id
+    console.log(this.patientID);
+    if(typeof(patientID) == 'undefined' || !patientID || patientID<=0) {
+      this.$message.error('参数错误，无法请求');
+      return false;
+    }
+    this.patientID = patientID;
+    this.listQuery.patient_id = patientID;
+    // if (this.patientID==0)
+    this.getList();
+  },
+  methods: {
+    getList() {
+      GetPersonLapsetoData(this.listQuery).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+            this.tableData = [];
+            this.total = response.data.data.total;
+            this.patientInfo = response.data.data.patient;
+            var lapsetos = response.data.data.lapsetos;
+            for (const index in lapsetos) {
+                this.tableData.push(lapsetos[index]);
+            }
+        }
+      });
+    },
+    changeTime() {
+      this.getList();
+    },
+    onSearch(){
+      this.getList();
+    },
+    changeModel() {
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.listQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ""
+    },
+    getProjectName(id) {
+      return (id in this.projectOptions) ? this.projectOptions[id].project_name:'';
+    },
+    getPatientName(id) {
+      return (id in this.patientMap) ? this.patientMap[id].name:'';
+    },
+    getPatientLapseto(lapseto) {
+      if(lapseto==1) {
+        return '留治';
+      }else if(lapseto == 2) {
+        return '转出';
+      }
+      return '--';
+    },
+    getPatientSource(srouce){
+      if(srouce==1) {
+        return '门诊';
+      }else if(srouce == 2) {
+        return '住院';
+      }
+      return '其他';
+    },
+    getPatientGender(gender) {
+      if (gender == 1) {
+        return '男';
+      } else if(gender == 2) {
+        return '女';
+      }
+      return '';
+    },
+    tranAge(birthday) {
+        var birth = uParseTime(birthday, '{y}-{m}-{d}');
+        return jsGetAge(birth, '-');
+    },
+    getPatientDialysisNo(id) {
+      return (id in this.patientMap) ? this.patientMap[id].dialysis_no:'';
+    },
+    getItemVulue(project_id, item_id, row) {
+        var key = project_id + '_' + item_id;
+        return (typeof(row.items) !== 'undefined' && (key in row.items)) ? row.items[key].inspect_value:'';
+    },
+    renderheader(h, { column, $index }) {
+        return h('span', {}, [
+            h('span', {}, column.label.split('//')[0]),
+            h('br'),
+            h('span', {}, column.label.split('//')[1])
+        ])
+    },
+  },
+  components: {
+      personNav,
+      BreadCrumb,
+      personInfo
+  }
+};
+</script>
+<style>
+#oictable ::-webkit-scrollbar {
+  height: 15px;
+}
+#outcome-indicators-query .el-form-item {
+    margin-bottom: 0px !important;
+}
+</style>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container {
+//   margin: 20px;
+  font-size: 15px;
+  .filter-container {
+    padding-bottom: 5px;
+  }
+  .hui {
+    color: #909399;
+    margin-bottom: 5px;
+  }
+  .huixiao {
+    border: solid 1px #ebeef5;
+  }
+  .search-component {
+    width: 500px;
+    .searchBox {
+      width: 300px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 15px;
+      border: 1px #dcdfe6 solid;
+      border-right: none;
+      outline: none;
+      float: left;
+      border-radius: 6px 0 0 6px;
+      font-size: 14px;
+      color: #333;
+      background: #fff;
+      box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
+    }
+    .searchBtn {
+      background-color: #409eff;
+      color: #fff;
+      font-size: 15px;
+      text-align: center;
+      height: 36px;
+      line-height: 36px;
+      float: left;
+      outline: none;
+      width: 70px;
+      border: none;
+      border-radius: 0 6px 6px 0;
+      font-family: "Microsoft Yahei";
+      cursor: pointer;
+    }
+  }
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+    span {
+      color: #ef2525;
+      font-family: "Arial";
+      padding: 0 2px;
+    }
+  }
+}
+</style>

src/xt_pages/sign/index.vue

@@ -1,4 +1,9 @@
 <template>
+
+    <div class="main-contain">
+    <div class="position">
+        <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
     <div class="app-container sign-and-weigh-box">
         <el-row :gutter="20">
             <el-col :span="7">
@@ -134,15 +139,22 @@
                 </el-form>
             </el-col>
         </el-row>
-    </div>
+    </div>   
+   </div>
 </template>
 
 <script>
 import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata } from '@/api/signandweigh'
+import BreadCrumb from '../components/bread-crumb'
 export default {
   name: 'sign',
+  components: { BreadCrumb },
   data() {
     return {
+      crumbs: [
+          { path: false, name: '签到称重' },
+          { path: '/sign/index', name: '签到称重' }
+        ],
       patientlist: [],
       signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
       queryParams: {

src/xt_pages/user/components/PatientDetail.vue

@@ -1062,6 +1062,7 @@ export default {
     },
 
     qrcode(patientID, name, gender, idCardNo, dialysisNo, phone, healthCareNo) {
+      document.getElementById("qrcode").innerHTML = "";
       new QRCode('qrcode', {
         width: 200,
         height: 200,

src/xt_permission.js

@@ -10,19 +10,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()