统计配置开发

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -170,6 +170,7 @@
           >打印</el-button
         >
       </template>
+      
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
@@ -259,6 +260,10 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 15"
       ></DialysisPrintOrderFifteen>
+      <DialysisPrintOrderSixteen
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 16"
+      ></DialysisPrintOrderSixteen>
     </div>
   </div>
 </template>
@@ -284,7 +289,7 @@ import DialysisPrintOrderEleven from "./template/DialysisPrintOrderEleven";
 import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
 import DialysisPrintOrderThirteen from "./template/DialysisPrintOrderThirteen";
 import DialysisPrintOrderFifteen from "./template/DialysisPrintOrderFifteen";
-
+import DialysisPrintOrderSixteen from "./template/DialysisPrintOrderSixteen";
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -302,6 +307,7 @@ export default {
     DialysisPrintOrderSeven,
     DialysisPrintOrderEight,
     DialysisPrintOrderNine,
+    DialysisPrintOrderSixteen,
     LabelBox,
     BreadCrumb
   },
@@ -531,6 +537,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      }else if (this.org_template_info.template_id == 16){
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -164,8 +164,8 @@
                       <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>
+                      <p>其他:{{item.count}}人({{((item.count)/InfectiousTotal*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="((item.count)/InfectiousTotal*100).toFixed(1)"></el-progress>
                   </span>
                 </div>
               </div>
@@ -477,7 +477,6 @@ export default {
       getDialysisModeType(startDate,endDate).then(response=>{
          if(response.data.state == 1){
           var modetype =  response.data.data.modetype
-          console.log("mode---",modetype)
             var total =  response.data.data.total
             console.log("total",total)
             this.total = total
@@ -522,32 +521,26 @@ export default {
        getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
            if(response.data.state === 1){
              this.InfectiousTotal = response.data.data.total
+             console.log("===",this.InfectiousTotal)
              var infectious = response.data.data.count
-             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 = "梅毒"
-            //   }
-
-            // }
+             console.log("infectious",infectious)
              var otherTotal = response.data.data.otherTotal
+             console.log("otherTotal",otherTotal)
              this.otherTotal = otherTotal
-             // console.log("infectious-----------",otherTotal)
+              var arr = [
+                {count:0,disease_id:2},
+                {count:0,disease_id:3},
+                {count:0,disease_id:4},
+                {count:0,disease_id:5},
+                {count:0,disease_id:6},
+              ]
+             if(infectious.length == 0){
+                this.InfectiousList = arr
+                return false
+                
+             }
+             this.InfectiousList = infectious
+            
            }
        })
     },
@@ -555,15 +548,22 @@ export default {
       getTotalAgeCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
-          this.ageCount = ageCount
-        //  console.log("ageCount",ageCount)
+          var arr = []
+          arr =  ageCount.sort(this.compare('age'))
+          this.ageCount = arr
           this.ageTotal =  response.data.data.total
-         // var two = response.data.data.two
-        //  console.log("two",two)
 
          }
       })
     },
+     compare:function (k) {
+          return function (a, b) {
+              var M = a[k];
+              var N = b[k];
+              return M - N;      // 从低向高排
+              // return N - M;   // 从高向低排
+          }
+      },
     //统计透析年龄
     getTotalDialysisCount(timeStar,timeEnd){
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -192,11 +192,12 @@ export default {
 
     //编辑
     handleEdit(id) {
+      console.log("id",id)
       this.editDialog = true;
       getConfigurationDetail(id).then(response=>{
          if(response.data.state == 1){
            var configurationdetail = response.data.data.configurationdetail
-          // console.log("详情",configurationdetail)
+          console.log("详情",configurationdetail)
            this.editform.id = configurationdetail.id
            this.editform.inspectionMajor = configurationdetail.inspection_major
            this.editform.inspectionMinor = configurationdetail.inspection_minor
@@ -216,7 +217,7 @@ export default {
       getInspectionMajor().then(response=>{
         if(response.data.state == 1){
           var inspection =  response.data.data.inspection
-          //console.log("大项",inspection)
+          console.log("大项",inspection)
           this.InspectionMajor = inspection
          
         }