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

src/xt_pages/qcd/basicInformationAnalysis.vue

               </div>
               <div class="borderBox2">
                <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>
+                 <span v-if="item.disease_id == 2">
+                    <p>乙肝:{{item.count}}人({{(item.count/InfectiousTotal*100).toFixed(1)}}%)</p>
+                    <el-progress :percentage="(item.count/InfectiousTotal*100).toFixed(1)"></el-progress>
+                  </span>
+                  <span v-if="item.disease_id == 3">
+                    <p>丙肝:{{item.count}}人({{(item.count/InfectiousTotal*100).toFixed(1)}}%)</p>
+                    <el-progress :percentage="(item.count/InfectiousTotal*100).toFixed(1)"></el-progress>
+                  </span>
+                   <span v-if="item.disease_id == 4">
+                    <p>艾滋病:{{item.count}}人({{(item.count/InfectiousTotal*100).toFixed(1)}}%)</p>
+                    <el-progress :percentage="(item.count/InfectiousTotal*100).toFixed(1)"></el-progress>
+                  </span>
+                  <span v-if="item.disease_id == 5">
+                    <p>肺结核:{{item.count}}人({{(item.count/InfectiousTotal*100).toFixed(1)}}%)</p>
+                    <el-progress :percentage="(item.count/InfectiousTotal*100).toFixed(1)"></el-progress>
+                  </span>
+                   <span v-if="item.disease_id == 6">
+                      <p>梅毒:{{item.count}}人({{(item.count/InfectiousTotal*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/InfectiousTotal*100).toFixed(1)"></el-progress>
+                  </span>
+                    <span v-if="item.disease_id == 1">
+                      <p>其他:{{item.count + otherTotal}}人({{((item.count+otherTotal)/InfectiousTotal*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="((item.count+otherTotal)/InfectiousTotal*100).toFixed(1)"></el-progress>
+                  </span>
                 </div>
               </div>
             </div>
       InfectiousTotal:0,
       ageCount:[],
       ageTotal:0,
+      otherTotal:0,
     };
   },
   methods: {
          }
       })
     },
+    //统计男女比例
     getTotalSexCount(timeStar,timeEnd){
       getTotalSexCount(timeStar,timeEnd).then(response=>{
         if(response.data.state === 1){
           var total = response.data.data.total
+        //  console.log("总人数",total)
           this.totalGender = total
           var totalMan = response.data.data.totalSex
+       //  console.log("男人",totalMan)
           this.totalMan = totalMan
           var totalWoman = total - totalMan
           this.totalWoman = totalWoman
            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)
+             this.InfectiousList = infectious
+           // for(let i=0;i<infectious.length;i++){
+           //   if(infectious[i].disease_id == 1){
+           //      infectious[i].disease_id = "其他"
+            //   }
+            //   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 = "梅毒"
+            //   }
+               
+            // }
+             var otherTotal = response.data.data.otherTotal
+             this.otherTotal = otherTotal
+             // console.log("infectious-----------",otherTotal)
            }
        })
     },
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
           this.ageCount = ageCount
-          console.log("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=>{
+         if(response.data.state == 1){
+           var patients = response.data.data.patients
+           var now = new Date()
+           var nowMonth = now.getMonth(); //当前月 
+           var nowYear = now.getFullYear(); //当前年 
+           var notime =  moment(new Date()).format('YYYY-MM-DD')
+           var nowdataunix =  Date.parse(notime)/1000
+           console.log("档期是---------------",nowdataunix)
+           for(let i=0;i<patients.length;i++){
+             if(patients[i].first_dialysis_date){
+             }
+           }
+           console.log("patients",patients)
+            var date =  new Date(1212508800)
+          console.log("date",date)
+          
+         }
       })
     }
   },
       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)
+     // console.log("本月第一天",timeStar)
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-      console.log("本月最后一天",timeEnd)
+     // console.log("本月最后一天",timeEnd)
       //统计透析总量
       this.getDialysisModeType(startDate,endDate)
       //统计转归状态

src/xt_pages/user/inspection.vue

             var inspections = response.data.data.inspections;
             this.total = response.data.data.total;
             this.itemDate = response.data.data.date.split(" ")[0];
-            console.log("1111"+this.itemDate)
             this.inspections = response.data.data.inspections;
             if (inspections == null) {
               this.inspections = [];
             var inspectionsMap = {};
             this.inspectionsMap = {};
             for (var index in inspections) {
+              console.log(inspections[index])
               inspectionsMap[inspections[index].item_id] = inspections[index];
+
               this.inspectionsMap[inspections[index].item_id] =
                 inspections[index];
             }
             var items = this.project.inspection_reference;
+
+            console.log(items)
+            console.log(inspectionsMap)
+
+
+
             for (var index in items) {
+
               if (
                 items[index].id in inspectionsMap ||
                 items[index].item_id in inspectionsMap
               ) {
+
+
                 var item = {};
                 for (var key in items[index]) {
                   item[key] = items[index][key];
                 }
+                console.log(item.item_id);
+
                 if (item.item_id > 0) {
+                  console.log(item)
+                  console.log(items[index].item_id)
+                  console.log(inspectionsMap)
+
+                  console.log(inspectionsMap[parseInt(items[index].item_id)].inspect_value)
+
                   item.value =
                     inspectionsMap[items[index].item_id].inspect_value;
+
+
                 } else {
+
                   item.value = inspectionsMap[items[index].id].inspect_value;
                 }
+
                 item.value_direction = "";
                 if (item.range_type == 1) {
+
                   var value = parseFloat(item.value);
                   var range_min = parseFloat(item.range_min);
                   var range_max = parseFloat(item.range_max);
                   }
                 }
                 this.items.push(item);
+
               }
+
             }
-            console.log(this.items);
+
+
           }
         })
         .catch(v => {});

src/xt_pages/workforce/appointment.vue

 
       },
       getWeekPanels() {
+        // this.scheduleZoneRow = []
+        // this.scheduleZone = []
         getWeekPanels(1).then(response => {
           if (response.data.state == 0) {
             return false
             break
 
           case '_6' :
-            return this.days[4]
+            return this.days[3]
 
             break
 
           case  '_7':
-            return this.days[4]
+            return this.days[3]
 
             break
 

src/xt_pages/workforce/template.vue

             break
 
           case '_6' :
-            return this.days[4]
+            return this.days[3]
 
 
             break
 
           case  '_7':
-            return this.days[4]
+            return this.days[3]
 
 
             break