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

src/api/common/common.js

     params: params
   })
 }
+
+export function getTotalLapseCount(startime, endtime) {
+  const params = {
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/gettotallapsecount',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getTotalSexCount(startime, endtime) {
+  const params = {
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/gettotalsexcount',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getTotalInfectiousCount(startime, endtime) {
+  const params = {
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/gettoalinfectiouscount',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getTotalAgeCount(startime, endtime) {
+  const params = {
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/gettotalagecount',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getTotalDialysisCount(startime, endtime) {
+  const params = {
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/gettotaldialysiscount',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

           <td>执行者签名</td>
         </tr>
         <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
-          <td style="height:30px;line-height:30px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-          <td class="parent">
+          <td style="height:40px;line-height:40px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+          <td class="parent" style="max-width:400px">
             <span v-if="advice.parent_id > 0">---></span>
             <span>{{ advice.advice_name }}</span>
             <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
 
 
             <tr v-for="monitor in monitors" :key="monitor.id">
-              <td>&nbsp;
+              <td style="height:40px;line-height:40px">&nbsp;
                 {{getTime(monitor.operate_time,'{h}:{i}')}}
               </td>
               <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} /
             </td>
             <td width="50" style="border:none;padding-left:5px">透析器凝血:</td>
             <td width="120" style="text-align:left;border:none;">
-              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false" showValue="0"></label-box>
-              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false" showValue="+"></label-box>
-              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1" showValue="+ +"></label-box>
-              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false" showValue="+ + +"></label-box>
+              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false) : false" showValue="0"></label-box>
+              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false) : false" showValue="+"></label-box>
+              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false) : false" showValue="+ +"></label-box>
+              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false) : false" showValue="+ + +"></label-box>
             </td>
           </tr>
         </tbody>
       <table class="print-table" border="1">
         <tr style="height:36px;text-align:left;border:none;">
           <td style="padding-left:5px;border:none">
-              <p style="margin-bottom:60px">
+              <p style="margin-bottom:160px">
                 透析小结：{{ summary.dialysis_summary ? summary.dialysis_summary : "" }}
               </p>
           </td>
             var obj3 = { advice_name: "", start_time: "" };
             var obj4 = { advice_name: "", start_time: "" };
             var obj5 = { advice_name: "", start_time: "" };
+            var obj6 = { advice_name: "", start_time: "" };
+            var obj7 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
             tableAdvice.push(obj4);
             tableAdvice.push(obj5);
+            tableAdvice.push(obj6);
+            tableAdvice.push(obj7);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 1) {
             var obj2 = { advice_name: "", start_time: "" };
             var obj3 = { advice_name: "", start_time: "" };
             var obj4 = { advice_name: "", start_time: "" };
+            var obj5 = { advice_name: "", start_time: "" };
+            var obj6 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
             tableAdvice.push(obj4);
+            tableAdvice.push(obj5);
+            tableAdvice.push(obj6);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 2) {
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
             var obj3 = { advice_name: "", start_time: "" };
+            var obj4 = { advice_name: "", start_time: "" };
+            var obj5 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
+            tableAdvice.push(obj4);
+            tableAdvice.push(obj5);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 3) {
             // eslint-disable-next-line no-redeclare
             var obj2 = { advice_name: "", start_time: "" };
             // eslint-disable-next-line no-redeclare
+            var obj3 = { advice_name: "", start_time: "" };
+            var obj4 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
-
+            tableAdvice.push(obj3);
+            tableAdvice.push(obj4);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 4) {
             // eslint-disable-next-line no-redeclare
             var obj1 = { advice_name: "", start_time: "" };
             // eslint-disable-next-line no-redeclare
-
+            var obj2 = { advice_name: "", start_time: "" };
+            var obj3 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
+            tableAdvice.push(obj2);
+            tableAdvice.push(obj3);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 5) {
             var obj = { advice_name: "", start_time: "" };
             // eslint-disable-next-line no-redeclare
             var obj1 = { advice_name: "", start_time: "" };
+            var obj1 = { advice_name: "", start_time: "" };
+            // eslint-disable-next-line no-redeclare
+            var obj2 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
+            tableAdvice.push(obj2);
             this.tableAdvice = tableAdvice;
           }
 

src/xt_pages/qcd/basicInformationAnalysis.vue

             
               <div class="borderBox">
                <div v-for="(item,index) in modetype" :key="index">
-                <p>{{item.mode_id}}:{{getTotalCount(item.mode_id)}}次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
+                <p>{{item.mode_id}}:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                </div>
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
               </div>
             </div>
             <div class="infoOne">
                 <p class="infoTitle">传染病统计</p>
               </div>
               <div class="borderBox2">
-                <p>无传染病:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>乙肝:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
+               <div v-for="(item,i) in this.InfectiousList" :key="i">
+                  <p>{{item.disease_id}}:{{item.count}}人({{(item.count/InfectiousTotal*100).toFixed(1)}}%)</p>
+                  <el-progress :percentage="(item.count/InfectiousTotal*100).toFixed(1)"></el-progress>
+                </div>
               </div>
             </div>
           </div>
             <div class="infoOne">
               <div class="titleBox">
                 <span class="point1"></span>
-                <p class="infoTitle">转归统计(总人数100人)</p>
+                <p class="infoTitle">转归统计(总人数{{patientCount}}人)</p>
               </div>
               <div class="borderBox1">
-                <p>留治:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>转出:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
+                <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>
               </div>
             </div>
             <div class="infoOne">
                 <p class="infoTitle">男女比例</p>
               </div>
               <div class="borderBox2">
-                <p>男:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>女:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
+                <p>男:{{totalMan}}人({{(totalMan/totalGender*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(totalMan/totalGender*100).toFixed(1)"></el-progress>
+                <p>女:{{totalWoman}}人({{(totalWoman/totalGender*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(totalWoman/totalGender*100).toFixed(1)"></el-progress>
               </div>
             </div>
             <div class="infoOne">
                 <p class="infoTitle">年龄统计</p>
               </div>
               <div class="borderBox">
-                <p>年龄&lt;20:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>20≤年龄≤30:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>30≤年龄≤40:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>其他:64人(64%)</p>
-                <el-progress :percentage="70"></el-progress>
+                <div v-for="(item,j) in ageCount" :key="j">
+                    <span v-if="item.age == 20">
+                     <p>年龄≤20:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
+                     <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
+                    </span>
+                   <span v-if="item.age == 40">
+                      <p>20&lt;年龄≤40:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
+                    </span>
+                    <span v-if="item.age == 60">
+                      <p>40&lt;年龄≤60:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
+                    </span>
+                    <span v-if="item.age == 80">
+                     <p>60&lt;年龄≤80:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
+                     <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
+                    </span>
+                    <span v-if="item.age ==150">
+                      <p>大于80:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
+                    </span>
+                </div>
               </div>
             </div>
             <div class="infoOne">
                 <p class="infoTitle">透龄统计</p>
               </div>
               <div class="borderBox1">
-                <p>透析龄&lt;12:64人(64%)</p>
+                <p>透析龄≤12:64人(64%)</p>
                 <el-progress :percentage="70"></el-progress>
-                <p>12≤透析龄≤36:64人(64%)</p>
+                <p>12&lt;透析龄≤36:64人(64%)</p>
                 <el-progress :percentage="70"></el-progress>
                 <p>36≤透析龄≤60:64人(64%)</p>
                 <el-progress :percentage="70"></el-progress>
 import PieChart from "../qcd/components/BarChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import {getDialysisModeType} from "@/api/common/common"
+import {getDialysisModeType,getTotalLapseCount,getTotalSexCount,getTotalInfectiousCount,getTotalAgeCount,getTotalDialysisCount} from "@/api/common/common"
 export default {
   name: "dialysisTotal",
   components: {
       ],
       modetype:[],
       total:0,
+      patientCount:0,
+      rollOut:0,
+      RetentionCount:0,
+      totalMan:0,
+      totalWoman:0,
+      totalGender:0,
+      InfectiousList:[],
+      InfectiousTotal:0,
+      ageCount:[],
+      ageTotal:0,
     };
   },
   methods: {
     getDialysisModeType(startDate,endDate){
       getDialysisModeType(startDate,endDate).then(response=>{
          if(response.data.state == 1){
-           var modetype =  response.data.data.modetype
+          var modetype =  response.data.data.modetype
+          console.log("mode---",modetype)
             var total =  response.data.data.total
             console.log("total",total)
             this.total = total
            }
            this.modetype = modetype
            console.log("modetype",modetype)
-           
+         
          }
       })
     },
-    getTotalCount(id){
-      console.log("id",id)
+    //统计转归
+    getTotalLapseCount(startDate,endDate){
+      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
+          var count = response.data.data.count
+          this.patientCount = count
+          this.RetentionCount = count-total
+         }
+      })
+    },
+    getTotalSexCount(timeStar,timeEnd){
+      getTotalSexCount(timeStar,timeEnd).then(response=>{
+        if(response.data.state === 1){
+          var total = response.data.data.total
+          this.totalGender = total
+          var totalMan = response.data.data.totalSex
+          this.totalMan = totalMan
+          var totalWoman = total - totalMan
+          this.totalWoman = totalWoman
+        }
+      })
+    },
+    //统计传染病
+    getTotalInfectiousCount(timeStar,timeEnd){
+       getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
+           if(response.data.state === 1){
+             this.InfectiousTotal = response.data.data.total
+             var infectious = response.data.data.count
+             for(let i=0;i<infectious.length;i++){
+               if(infectious[i].disease_id == 2){
+                 infectious[i].disease_id = "乙肝"
+               }
+               if(infectious[i].disease_id == 3){
+                 infectious[i].disease_id = "丙肝"
+               }
+               if(infectious[i].disease_id == 4){
+                 infectious[i].disease_id = "艾滋病"
+               }
+               if(infectious[i].disease_id == 5){
+                 infectious[i].disease_id = "肺结核"
+               }
+               if(infectious[i].disease_id == 6){
+                 infectious[i].disease_id = "梅毒"
+               }
+               this.InfectiousList = infectious
+             }
+             console.log("infectious-----------",infectious)
+           }
+       })
+    },
+    getTotalAgeCount(timeStar,timeEnd){
+      getTotalAgeCount(timeStar,timeEnd).then(response=>{
+         if(response.data.state == 1){
+          var ageCount =  response.data.data.ageCount
+          this.ageCount = ageCount
+          console.log("ageCount",ageCount)
+          this.ageTotal =  response.data.data.total
+         // var two = response.data.data.two
+        //  console.log("two",two)
+         }
+      })
+    },
+    getTotalDialysisCount(timeStar,timeEnd){
+      getTotalDialysisCount(timeStar,timeEnd).then(response=>{
+      })
     }
   },
   created() {
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       console.log("开始时间",startDate)
       const endDate = moment(new Date()).format('YYYY-MM-DD')
-      console.log("结束时间",endDate)
+      console.log("结束时间",endDate) 
+      var now = new Date()
+      var nowMonth = now.getMonth(); //当前月 
+      var nowYear = now.getFullYear(); //当前年 
+      //本月的开始时间
+      var monthStartDate = new Date(nowYear, nowMonth, 1); 
+      var timeStar=Date.parse(monthStartDate)/1000;//s
+      console.log("本月第一天",timeStar)
+      //本月的结束时间
+      var monthEndDate = new Date(nowYear, nowMonth+1, 0);
+      var timeEnd=Date.parse(monthEndDate)/1000-1;//s
+      console.log("本月最后一天",timeEnd)
+      //统计透析总量
       this.getDialysisModeType(startDate,endDate)
+      //统计转归状态
+      this.getTotalLapseCount(timeStar,timeEnd)
+      //统计男女比例
+      this.getTotalSexCount(timeStar,timeEnd)
+      //统计传染病
+      this.getTotalInfectiousCount(timeStar,timeEnd)
+      //统计年龄
+      this.getTotalAgeCount(timeStar,timeEnd)
+      //统计透析年龄
+      this.getTotalDialysisCount(timeStar,timeEnd)
   },
 };
 </script>
           rgba(159, 189, 252, 1)
         );
       }
+      .el-progress-bar{
+        margin-right: -59px;
+        padding-right: 60px;
+      }
     }
     .borderBox1 {
       .el-progress-bar__inner {
           rgba(255, 153, 148, 1)
         );
       }
+      .el-progress-bar{
+        margin-right: -59px;
+        padding-right: 60px;
+      }
     }
     .borderBox2 {
       .el-progress-bar__inner {
           rgba(179, 168, 247, 1)
         );
       }
+      .el-progress-bar{
+        margin-right: -59px;
+        padding-right: 60px;
+      }
     }
   }
 }

src/xt_pages/statistics/index.vue

               contagionMap[contagionList[index].id] = contagionList[index].name;
             }
             var diseaseCounts = response.data.data.disease_counts;
+            console.log("diseaseCounts",diseaseCounts)
             var diseaseCountsMap = {};
             for (var index in diseaseCounts) {
               diseaseCountsMap[diseaseCounts[index].disease_id] =