导出

src/api/common/common.js

@@ -134,11 +134,14 @@ export function DeleteCheck(id, params) {
   })
 }
 
-export function getDialysisModeType(startime, endtime) {
+export function getDialysisModeType(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
+  console.log("parasm22222",params)
   return request({
     url: '/com/api/getdialysismodetype',
     method: 'get',
@@ -146,10 +149,12 @@ export function getDialysisModeType(startime, endtime) {
   })
 }
 
-export function getTotalLapseCount(startime, endtime) {
+export function getTotalLapseCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   console.log('转归params', params)
   return request({
@@ -159,10 +164,12 @@ export function getTotalLapseCount(startime, endtime) {
   })
 }
 
-export function getTotalSexCount(startime, endtime) {
+export function getTotalSexCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   return request({
     url: '/com/api/gettotalsexcount',
@@ -171,10 +178,12 @@ export function getTotalSexCount(startime, endtime) {
   })
 }
 
-export function getTotalInfectiousCount(startime, endtime) {
+export function getTotalInfectiousCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   console.log('传染病', params)
   return request({
@@ -184,10 +193,12 @@ export function getTotalInfectiousCount(startime, endtime) {
   })
 }
 
-export function getTotalAgeCount(startime, endtime) {
+export function getTotalAgeCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   return request({
     url: '/com/api/gettotalagecount',
@@ -196,10 +207,12 @@ export function getTotalAgeCount(startime, endtime) {
   })
 }
 
-export function getTotalDialysisCount(startime, endtime) {
+export function getTotalDialysisCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   return request({
     url: '/com/api/gettotaldialysiscount',

src/store/modules/globalConfig.js

@@ -1844,7 +1844,10 @@ const global_config = {
         id: 32,
         name: '米'
       },
-
+      {
+        id: 33,
+        name: '万份'
+      },
     ],
     body_fluid: [{
       id: 1,

src/xt_pages/data/components/addDrugs.vue

@@ -51,7 +51,7 @@
                         <el-form-item label="药品类型 : " prop="drug_type">
                             <el-select v-model="form.drug_type" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in getDictionaryDataConfig('system','drug_type')"
+                                        v-for="(item,index) in getDictionaryDataConfig('system','drug_type')"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">
@@ -156,7 +156,7 @@
                         </el-form-item>
 
 
-                        <el-form-item label="限制性用药 : " prop="lmt_used_flag">
+                        <el-form-item label="限制性用药 : ">
                             <el-select v-model="form.lmt_used_flag" style="width:160px;" placeholder="请选择">
                                 <el-option
                                         v-for="item,index in lmt_used_flags"
@@ -196,8 +196,8 @@
 
                             <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
                                 <el-option
-                                        v-for="item in manufacturerList"
-                                        :key="item.id"
+                                        v-for="(item,index) in manufacturerList"
+                                        :key="index"
                                         :label="item.manufacturer_name"
                                         :value="item.id">
                                 </el-option>
@@ -602,8 +602,13 @@
         this.form.intro = ''
       },
       show(id, obj) {
-        console.log('obj222', obj)
-        // this.clear()
+        console.log("obj3333333",obj)
+        this.getlist()
+        this.GetAllConfig()
+        if(obj.dealer == 0){
+           obj.dealer = ""
+        }
+        
         this.visible = true
         if (id == 0) {
           this.formTitle = '新增'
@@ -714,7 +719,7 @@
 
         form['hosp_appr_flag'] = this.form.hosp_appr_flag
         form['lmt_used_flag'] = this.form.lmt_used_flag
-
+       
         return form
       },
       getlist() {
@@ -747,9 +752,13 @@
       }
     },
     created() {
-      this.getlist()
-      //获取所有经销商
+       //获取所有经销商
       this.GetAllConfig()
+      this.getlist()
+
+      var drug_type =  this.getDictionaryDataConfig('system','drug_type')
+      console.log("药品类型333333",drug_type)
+     
     }
   }
 </script>

src/xt_pages/data/components/consumables.vue

@@ -66,7 +66,7 @@
      <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
         <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
-        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/stock_template.xlsx" :underline="false"
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/stock_template2.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -1199,10 +1199,10 @@
               }
            }
 
-           if (results[i]['*经销商'] === undefined) {
+           if (results[i]['经销商'] === undefined) {
                 obj['dealer'] = ''
               } else {
-             if (key == '*经销商') {
+             if (key == '经销商') {
                obj['dealer'] = results[i][key].replace(/\s/g,"")
               }
            }
@@ -1341,22 +1341,15 @@
          
 
           if(tableData[i].special_medical == "是"){
-             tableData[i].special_medical = 1
+             tableData[i].special_medical = "1"
           }
           if(tableData[i].special_medical == "否"){
-             tableData[i].special_medical = 2
+             tableData[i].special_medical = "2"
           }
        }
         
        for(let i=0;i<tableData.length;i++){
-          tableData[i].retail_price = parseInt(tableData[i].retail_price) 
-           
-          if(tableData[i].buy_price == ""){
-             tableData[i].buy_price = 0
-          }else{
-             tableData[i].buy_price = parseInt(tableData[i].buy_price)
-          }
-
+         
           if(tableData[i].is_special_diseases == ""){
              tableData[i].is_special_diseases = 0
           }else{
@@ -1375,7 +1368,7 @@
        let params = {
           'goods':tableData 
         }
-       console.log("params2222",params)
+       console.log("params22229999999",params)
        
        
         postGoodInformation(params).then(response=>{

src/xt_pages/data/components/drugs.vue

@@ -64,7 +64,7 @@
     <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
         <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/drug_template.xlsx" :underline="false"
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/drug_template2.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -480,11 +480,11 @@
         return name
       },
       goodInfoDialogComfirm: function(val) {
-
+        
         //修改自备药
         var untit = ""
         var untis = getDataConfig('hemodialysis','units')
-        console.log("999999",untis)
+        
         for(let i=0;i<untis.length;i++){
            if(val.min_unit == untis[i].id){
               untit = untis[i].name
@@ -673,6 +673,7 @@
               if(this.formValue.hosp_appr_flag == 0){
                 this.formValue.hosp_appr_flag = ""
               }
+              
               this.$refs.addDrugs.show(id, this.formValue)
 
             }
@@ -910,8 +911,6 @@
             
           var isHasDrugName = header.includes('*药品名称')
          
-          var isHasDrugAlias = header.includes('*药品别名')
-          
           var isHasDrugSpec = header.includes('*药品规格')
         
           var isHasDrugType =  header.includes('*药品类型')
@@ -936,8 +935,11 @@
 
          var isHasManufacturer = header.includes('*生产厂商')
 
+         var isHasDrugDose = header.includes('*剂量')
+           
+         var isDrugDoseUnit = header.includes('*剂量单位')
      
-          if (!(isHasDrugName && isHasDrugAlias && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer)) {
+          if (!(isHasDrugName  && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
             this.dialogVisible = true
             return
           }
@@ -960,10 +962,10 @@
            }
 
 
-           if (results[i]['*药品别名'] === undefined) {
+           if (results[i]['药品别名'] === undefined) {
                 obj['drug_alias'] = ''
               } else {
-           if (key == '*药品别名') {
+           if (key == '药品别名') {
                obj['drug_alias'] = results[i][key].replace(/\s/g,"")
               }
            }
@@ -1077,10 +1079,10 @@
               }
            }
 
-            if (results[i]['*经销商'] === undefined) {
+            if (results[i]['经销商'] === undefined) {
                 obj['dealer'] = ''
               } else {
-            if (key == '*经销商') {
+            if (key == '经销商') {
                 obj['dealer'] = results[i][key].replace(/\s/g,"")
               }
            }
@@ -1264,6 +1266,30 @@
               }
            }
 
+          if (results[i]['*剂量'] === undefined) {
+                obj['drug_dose'] = ''
+              } else {
+            if (key == '*剂量') {
+                obj['drug_dose'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*剂量单位'] === undefined) {
+                obj['drug_dose_unit'] = ''
+              } else {
+            if (key == '*剂量单位') {
+                obj['drug_dose_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['限制性用药'] === undefined) {
+                obj['lmt_used_flag'] = ''
+              } else {
+            if (key == '限制性用药') {
+                obj['lmt_used_flag'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
 
          }
          tableData.push(obj)
@@ -1316,7 +1342,18 @@
           if(tableData[i].hosp_appr_flag == "审批不通过"){
               tableData[i].hosp_appr_flag = 3
           }
+          if(tableData[i].lmt_used_flag == ""){
+             tableData[i].lmt_used_flag = 0
+          }
+          
+          if(tableData[i].lmt_used_flag == "否"){
+              tableData[i].lmt_used_flag = 0
+          }
 
+            
+          if(tableData[i].lmt_used_flag == "是"){
+              tableData[i].lmt_used_flag = 1
+          }
       
         }
        }

src/xt_pages/data/components/project.vue

@@ -49,9 +49,9 @@
             size="small"
           >下载模版
           </el-button>
-        </el-link> -->
+        </el-link>
 
-        <!-- <project-excel :on-success='handleSuccessOne'></project-excel>
+        <project-excel :on-success='handleSuccessOne'></project-excel>
 
         <el-button
           style="margin-left:10px;"
@@ -710,8 +710,8 @@ export default {
             if (results[i]['特检项目'] === undefined) {
                 obj['specail_project'] = ''
               } else {
-          if (key == 'specail_project') {
-               obj['category'] = results[i][key].replace(/\s/g,"")
+          if (key == '特检项目') {
+               obj['specail_project'] = results[i][key].replace(/\s/g,"")
               }
           }
 
@@ -739,8 +739,8 @@ export default {
           }
          }
          tableData.push(obj)
-         // console.log("项目列表",tableData)
-        
+         console.log("项目列表",tableData)
+
         for(let i=0;i<tableData.length;i++){
 
           if(tableData[i].disease_directory == ""){

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -63,6 +63,36 @@
           :picker-options="pickerOptions"
         ></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 lapsetoArr"
+              :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.source == sourceType ? 'active' : ''"
+              @click="selectSource(item.source)"
+              v-for="item in sourceArr"
+              :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div> -->
 
        <div class="cell clearfix" v-show="treatShow">
         <label class="title">
@@ -386,7 +416,19 @@ export default {
       dialysisAge:[],
       start:0,
       end:0,
-
+      lapsetoType: 0,
+      lapsetoArr: [
+        { value: 0, label: '全部', source: 0, lapseto: 0 },
+        { value: 1, label: '转出', source: 0, lapseto: 2 },
+        { value: 2, label: '留治', source: 0, lapseto: 1 },
+        { value: 3, label: '死亡', source:0,  lapseto: 3 },
+      ],
+      sourceType: 0,
+      sourceArr: [
+       { value: 0, label: '全部', source: 0, lapseto: 0 },
+       { value: 3, label: '门诊', source: 1, lapseto: 1 },
+       { value: 4, label: '住院', source: 2, lapseto: 1 }
+      ],
       way: 0,
       wayArr: [
         { value: 0, label: "统计图", state: 0 },
@@ -585,6 +627,8 @@ export default {
         { value: 1, label: "转出", state: 1}
       ],
       lapseid:0,
+      startDate:"",
+      endDate:"",
     };
 
 
@@ -604,17 +648,17 @@ export default {
         this.start_time = "";
       } else {
          //统计透析总量
-        this.getDialysisModeType(val,this.listQuery.end_time)
+        this.getDialysisModeType(val,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计转归状态
-        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计男女比例
         this.getTotalSexCount(timeStar,timeEnd)
         //统计传染病
-        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(timeStar,timeEnd)
+        this.getTotalAgeCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(timeStar,timeEnd)
+        this.getTotalDialysisCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
@@ -632,17 +676,17 @@ export default {
         this.listQuery.end_time = "";
       } else {
           //统计透析总量
-        this.getDialysisModeType(this.listQuery.start_time,val)
+        this.getDialysisModeType(this.listQuery.start_time,val,this.lapsetoType,this.sourceType)
         //统计转归状态
-        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(timeStar,timeEnd)
+        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(timeStar,timeEnd)
+        this.getTotalAgeCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(timeStar,timeEnd)
+        this.getTotalDialysisCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
@@ -655,6 +699,7 @@ export default {
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       const endDate = moment(new Date()).format('YYYY-MM-DD')
+     
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
@@ -669,17 +714,17 @@ export default {
       //本月
       if(state == 0){
        //统计透析总量
-        this.getDialysisModeType(startDate,endDate)
+        this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计转归状态
-        this.getTotalLapseCount(startDate,endDate)
+        this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(timeStar,timeEnd)
+        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(startDate,endDate)
+        this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(timeStar,timeEnd)
+        this.getTotalAgeCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(timeStar,timeEnd)
+        this.getTotalDialysisCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         this.start = timeStar
         this.end = timeEnd
         this.getCountModeId()
@@ -690,7 +735,7 @@ export default {
         this.listQuery.start_time = ""
         this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-        // console.log("三月前",startDate)
+       
         var startunitx = Date.parse(startDate)/1000
         // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
@@ -698,17 +743,17 @@ export default {
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
          //统计透析总量
-        this.getDialysisModeType(startDate,endDate)
+        this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
-        this.getTotalLapseCount(startDate,endDate)
+        this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(startunitx,endunitx)
+        this.getTotalSexCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(startDate,endDate)
+        this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(startunitx,endunitx)
+        this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(startunitx,endunitx)
+        this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
@@ -728,17 +773,17 @@ export default {
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
          //统计透析总量
-        this.getDialysisModeType(startDate,endDate)
+        this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
-        this.getTotalLapseCount(startDate,endDate)
+        this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(startunitx,endunitx)
+        this.getTotalSexCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(startDate,endDate)
+        this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(startunitx,endunitx)
+        this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(startunitx,endunitx)
+        this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
 
         this.start = startunitx
         this.end = endunitx
@@ -759,17 +804,17 @@ export default {
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
          //统计透析总量
-        this.getDialysisModeType(startDate,endDate)
+        this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
-        this.getTotalLapseCount(startDate,endDate)
+        this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(startunitx,endunitx)
+        this.getTotalSexCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(startDate,endDate)
+        this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(startunitx,endunitx)
+        this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(startunitx,endunitx)
+        this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
 
         this.start = startunitx
         this.end = endunitx
@@ -790,15 +835,17 @@ export default {
       this.lapseMode = state
       this.getRolloutCount(this.start,this.end)
     },
-    getDialysisModeType(startDate,endDate){
+    getDialysisModeType(startDate,endDate,lapsetoType,sourceType){
        this.modesData.series = []
        this.modesData.xAxis = []
-      getDialysisModeType(startDate,endDate).then(response=>{
+      getDialysisModeType(startDate,endDate,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
 
           var modetype =  response.data.data.modetype
           this.modetype = modetype
           var total =  response.data.data.total
+          console.log("total22222222",total)
+          // this.total = total[0].count
           this.total = total
           // console.log("数据",this.modetype)
           var modedate = response.data.data.modetype
@@ -1167,7 +1214,25 @@ export default {
 
          }
       })
-    }
+    },
+    selectSource(source) {
+      this.sourceType = source
+      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+    },
+    selectLapseTo(lapseto) {
+      this.lapsetoType = lapseto
+      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+    },
   },
   created() {
         //获取本月当前机构的透析模式
@@ -1182,18 +1247,21 @@ export default {
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
+
+      this.startDate = startDate
+      this.endDate = endDate
       //统计透析总量
-      this.getDialysisModeType(startDate,endDate)
+      this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
       //统计转归状态
-      this.getTotalLapseCount(startDate,endDate)
+      this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
       //统计男女比例
-      this.getTotalSexCount(timeStar,timeEnd)
+      this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       //统计传染病
-      this.getTotalInfectiousCount(startDate,endDate)
+      this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
       //统计年龄
-      this.getTotalAgeCount(timeStar,timeEnd)
+      this.getTotalAgeCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       //统计透析年龄
-      this.getTotalDialysisCount(timeStar,timeEnd)
+      this.getTotalDialysisCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
 
       //获取当前选中时间所有的透析模式
       this.getTreatModeList(timeStar,timeEnd)

src/xt_pages/workforce/appointment.vue

@@ -529,11 +529,15 @@
           }
           
           if(this.export_type == 1){
-            console.log("333333",this.newDay)
-             const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
-             const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
+
+            console.log("44444444",this.tableList)
+            //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
+            //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
+            //  const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+            const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '']]
+             const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
              const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
-            var list = []
+           var list = []
             let i = 0
             for (let key  in this.partitions) {
               var tempValue
@@ -659,12 +663,12 @@
         return isShow
       },
        handleSuccess({ results, header }) {
-       
+        
         let headers = []
         for (let key in results[0]) {
           headers.push(key)
         }
-        if (results.length > 0) {
+        if (results.length > 20) {
           var isHas_1 = headers.includes('区号')
           console.log("1"+isHas_1)
           var isHas_2 = headers.includes('机号')
@@ -889,9 +893,93 @@
             this.dialogVisible = true
             return
           }
-        } else {
+        }else if(results.length == 20){
+            var isHas_1 = headers.includes('区号')
+          console.log("1"+isHas_1)
+          var isHas_2 = headers.includes('机号')
+          console.log("2"+isHas_2)
+
+
+          var isHas_3 = headers.includes('周一'+"("+this.days[0]+")")
+          console.log("3"+isHas_3)
+
+
+          var isHas_4 = headers.includes('')
+          console.log("4"+isHas_4)
+
+
+          var isHas_5 = headers.includes('_1')
+          console.log("5"+isHas_5)
+
+          var isHas_6 = headers.includes('周二'+"("+this.days[1]+")")
+          console.log("6"+isHas_6)
+
+          var isHas_7 = headers.includes('_2')
+          console.log("7"+isHas_7)
+
+          var isHas_8 = headers.includes('_3')
+          console.log("8"+isHas_8)
+
+          var isHas_9 = headers.includes('周三'+"("+this.days[2]+")")
+          console.log("9"+isHas_9)
+
+          var isHas_10 = headers.includes('_4')
+          console.log("10"+isHas_10)
+
+          var isHas_11 = headers.includes('_5')
+          console.log("11"+isHas_11)
+
+          var isHas_12 = headers.includes('周四'+"("+this.days[3]+")")
+          console.log("12"+isHas_12)
+
+          var isHas_13 = headers.includes('_6')
+          console.log("13"+isHas_13)
+
+          var isHas_14 = headers.includes('_7')
+          console.log("14"+isHas_14)
+
+          var isHas_15 = headers.includes('周五'+"("+this.days[4]+")")
+          console.log("15"+isHas_15)
+
+          var isHas_16 = headers.includes('_8')
+          console.log("16"+isHas_16)
+
+
+          var isHas_17 = headers.includes('_9')
+          console.log("17"+isHas_17)
+
+
+          var isHas_18 = headers.includes('周六'+"("+this.days[5]+")")
+          console.log("18"+isHas_18)
+
+
+          var isHas_19 = headers.includes('_10')
+          console.log("19"+isHas_19)
 
 
+          var isHas_20 = headers.includes('_11')
+          console.log("20"+isHas_20)
+
+
+          var isHas_21 = headers.includes('周日'+"("+this.days[6]+")")
+          console.log("21"+isHas_21)
+
+          var isHas_22 = headers.includes('_12')
+          console.log("22"+isHas_22)
+
+          var isHas_23 = headers.includes('_13')
+          console.log("23"+isHas_23)
+         
+         if (!(isHas_1 && isHas_2 && isHas_3 && isHas_4 && isHas_5 &&
+            isHas_6 && isHas_7 && isHas_8 && isHas_9 && isHas_10 &&
+            isHas_11 && isHas_12 && isHas_13 && isHas_14 && isHas_15 &&
+            isHas_16 && isHas_17 && isHas_18 && isHas_19 && isHas_20 &&
+            isHas_21)) {
+            this.dialogVisible = true
+            return
+          }
+
+        } else {
 
           this.dialogVisible = true
           return
@@ -2071,97 +2159,128 @@
                 
                   obj['区号'] = partitions[key].name
                   obj['机号'] = jihaos[b].number.toString()
+                
+                if(this.export_type == 0){
+                    obj['shangwu'] = ''
+                    obj['xiawu'] = ''
+                    obj['wanshang'] = ''
 
+                    obj['shangwu1'] = ''
+                    obj['xiawu1'] = ''
+                    obj['wanshang1'] = ''
 
-                  obj['shangwu'] = ''
-                  obj['xiawu'] = ''
-                  obj['wanshang'] = ''
+                    obj['shangwu2'] = ''
+                    obj['xiawu2'] = ''
+                    obj['wanshang2'] = ''
 
-                  obj['shangwu1'] = ''
-                  obj['xiawu1'] = ''
-                  obj['wanshang1'] = ''
+                    obj['shangwu3'] = ''
+                    obj['xiawu3'] = ''
+                    obj['wanshang3'] = ''
 
-                  obj['shangwu2'] = ''
-                  obj['xiawu2'] = ''
-                  obj['wanshang2'] = ''
+                    obj['shangwu4'] = ''
+                    obj['xiawu4'] = ''
+                    obj['wanshang4'] = ''
 
-                  obj['shangwu3'] = ''
-                  obj['xiawu3'] = ''
-                  obj['wanshang3'] = ''
 
-                  obj['shangwu4'] = ''
-                  obj['xiawu4'] = ''
-                  obj['wanshang4'] = ''
+                    obj['shangwu5'] = ''
+                    obj['xiawu5'] = ''
+                    obj['wanshang5'] = ''
 
+                    obj['shangwu6'] = ''
+                    obj['xiawu6'] = ''
+                    obj['wanshang6'] = ''
 
-                  obj['shangwu5'] = ''
-                  obj['xiawu5'] = ''
-                  obj['wanshang5'] = ''
+                    obj['shangwu7'] = ''
+                    obj['xiawu7'] = ''
+                    obj['wanshang7'] = ''
 
-                  obj['shangwu6'] = ''
-                  obj['xiawu6'] = ''
-                  obj['wanshang6'] = ''
+                    obj['shangwu8'] = ''
+                    obj['xiawu8'] = ''
+                    obj['wanshang8'] = ''
 
-                  obj['shangwu7'] = ''
-                  obj['xiawu7'] = ''
-                  obj['wanshang7'] = ''
+                    obj['shangwu9'] = ''
+                    obj['xiawu9'] = ''
+                    obj['wanshang9'] = ''
 
-                  obj['shangwu8'] = ''
-                  obj['xiawu8'] = ''
-                  obj['wanshang8'] = ''
+                    obj['shangwu10'] = ''
+                    obj['xiawu10'] = ''
+                    obj['wanshang10'] = ''
 
-                  obj['shangwu9'] = ''
-                  obj['xiawu9'] = ''
-                  obj['wanshang9'] = ''
+                    obj['shangwu11'] = ''
+                    obj['xiawu11'] = ''
+                    obj['wanshang11'] = ''
 
-                  obj['shangwu10'] = ''
-                  obj['xiawu10'] = ''
-                  obj['wanshang10'] = ''
 
-                  obj['shangwu11'] = ''
-                  obj['xiawu11'] = ''
-                  obj['wanshang11'] = ''
+                    obj['shangwu12'] = ''
+                    obj['xiawu12'] = ''
+                    obj['wanshang12'] = ''
 
+                    obj['shangwu13'] = ''
+                    obj['xiawu13'] = ''
+                    obj['wanshang13'] = ''
 
-                  obj['shangwu12'] = ''
-                  obj['xiawu12'] = ''
-                  obj['wanshang12'] = ''
 
-                  obj['shangwu13'] = ''
-                  obj['xiawu13'] = ''
-                  obj['wanshang13'] = ''
+                    obj['shangwu14'] = ''
+                    obj['xiawu14'] = ''
+                    obj['wanshang14'] = ''
 
 
-                  obj['shangwu14'] = ''
-                  obj['xiawu14'] = ''
-                  obj['wanshang14'] = ''
+                    obj['shangwu15'] = ''
+                    obj['xiawu15'] = ''
+                    obj['wanshang15'] = ''
 
+                    obj['shangwu16'] = ''
+                    obj['xiawu16'] = ''
+                    obj['wanshang16'] = ''
 
-                  obj['shangwu15'] = ''
-                  obj['xiawu15'] = ''
-                  obj['wanshang15'] = ''
+                    obj['shangwu17'] = ''
+                    obj['xiawu17'] = ''
+                    obj['wanshang17'] = ''
 
-                  obj['shangwu16'] = ''
-                  obj['xiawu16'] = ''
-                  obj['wanshang16'] = ''
+                    obj['shangwu18'] = ''
+                    obj['xiawu18'] = ''
+                    obj['wanshang18'] = ''
 
-                  obj['shangwu17'] = ''
-                  obj['xiawu17'] = ''
-                  obj['wanshang17'] = ''
+                    obj['shangwu19'] = ''
+                    obj['xiawu19'] = ''
+                    obj['wanshang19'] = ''
 
-                  obj['shangwu18'] = ''
-                  obj['xiawu18'] = ''
-                  obj['wanshang18'] = ''
 
-                  obj['shangwu19'] = ''
-                  obj['xiawu19'] = ''
-                  obj['wanshang19'] = ''
+                    obj['shangwu20'] = ''
+                    obj['xiawu20'] = ''
+                    obj['wanshang20'] = ''
+                }
+                
+                 if(this.export_type == 1){
+                    obj['shangwu'] = ''
+                    obj['xiawu'] = ''
+                    obj['wanshang'] = ''
 
+                    obj['shangwu1'] = ''
+                    obj['xiawu1'] = ''
+                    obj['wanshang1'] = ''
 
-                  obj['shangwu20'] = ''
-                  obj['xiawu20'] = ''
-                  obj['wanshang20'] = ''
+                    obj['shangwu2'] = ''
+                    obj['xiawu2'] = ''
+                    obj['wanshang2'] = ''
 
+                    obj['shangwu3'] = ''
+                    obj['xiawu3'] = ''
+                    obj['wanshang3'] = ''
+
+                    obj['shangwu4'] = ''
+                    obj['xiawu4'] = ''
+                    obj['wanshang4'] = ''
+
+
+                    obj['shangwu5'] = ''
+                    obj['xiawu5'] = ''
+                    obj['wanshang5'] = ''
+
+                    obj['shangwu6'] = ''
+                    obj['xiawu6'] = ''
+                    obj['wanshang6'] = ''
+                 }
                   list.push(obj)
 
                 }