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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -776,7 +776,7 @@
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
 
               if (project_month_prescriptions.project[a].type == 2) {
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['statistical_classification'] = ''
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
                 obj['project'] = project_month_prescriptions.project[a].project
@@ -1111,13 +1111,15 @@
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['project'] = prescription.project[b].project
 
                     } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
+                      if(prescription.project[b].team_id > 0){
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
+                      }
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['good_info'] = prescription.project[b].good_info
@@ -1231,13 +1233,15 @@
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['project'] = prescription.project[b].project
 
                     } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
+                      if(prescription.project[b].team_id > 0){
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
+                      }
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['good_info'] = prescription.project[b].good_info

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -137,7 +137,7 @@
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{scope.row.type ==
-          2?getGroup(scope.row.statistical_classification):'耗材'}}
+          2?scope.row.statistical_classification:scope.row.statistical_classification}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -750,13 +750,14 @@
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
               if (project_month_prescriptions.project[a].type == 2) {
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['statistical_classification'] = ''
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
                 obj['project'] = project_month_prescriptions.project[a].project
 
               } else if (project_month_prescriptions.project[a].type == 3) {
                 obj['statistical_classification'] = ''
+
                 obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
                 obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
                 obj['good_info'] = project_month_prescriptions.project[a].good_info
@@ -1196,7 +1197,6 @@
                     id: prescription.project[b].id,
                     project_id: prescription.project[b].project_id,
                     project_name: prescription.project[b].project.project_name,
-                    statistical_classification: prescription.project[b].project.statistical_classification,
                     single_dose: prescription.project[b].single_dose,
                     delivery_way: prescription.project[b].delivery_way,
                     execution_frequency: prescription.project[b].execution_frequency,
@@ -1211,13 +1211,18 @@
                   }
 
                   if (prescription.project[b].type == 2) {
-                    obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                    console.log("prescription.project[b].team.project_team：")
+                    console.log(prescription.project[b].team.project_team)
+                    obj['statistical_classification'] = prescription.project[b].team.project_team
                     obj['medical_code'] = prescription.project[b].project.medical_code
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
 
                   } else if (prescription.project[b].type == 3) {
-                    obj['statistical_classification'] = ''
+                    if(prescription.project[b].team_id > 0){
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                    }
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['good_info'] = prescription.project[b].good_info
@@ -1331,7 +1336,6 @@
                       id: 0,
                       project_id: prescription.project[b].project_id,
                       project_name: prescription.project[b].project.project_name,
-                      statistical_classification: prescription.project[b].project.statistical_classification,
                       single_dose: prescription.project[b].single_dose,
                       delivery_way: prescription.project[b].delivery_way,
                       execution_frequency: prescription.project[b].execution_frequency,
@@ -1345,7 +1349,7 @@
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = ""
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['price'] = prescription.project[b].project.price
@@ -1590,7 +1594,6 @@
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -1604,13 +1607,16 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] = prescription.project[b].project
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] = prescription.project[b].good_info
@@ -1726,7 +1732,6 @@
                             id: 0,
                             project_id: prescription.project[b].project_id,
                             project_name: prescription.project[b].project.project_name,
-                            statistical_classification: prescription.project[b].project.statistical_classification,
                             single_dose: prescription.project[b].single_dose,
                             delivery_way: prescription.project[b].delivery_way,
                             execution_frequency: prescription.project[b].execution_frequency,
@@ -1740,7 +1745,7 @@
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
@@ -2066,7 +2071,6 @@
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -2080,13 +2084,16 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] = prescription.project[b].project
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] = prescription.project[b].good_info
@@ -2193,7 +2200,6 @@
                             id: 0,
                             project_id: prescription.project[b].project_id,
                             project_name: prescription.project[b].project.project_name,
-                            statistical_classification: prescription.project[b].project.statistical_classification,
                             single_dose: prescription.project[b].single_dose,
                             delivery_way: prescription.project[b].delivery_way,
                             execution_frequency: prescription.project[b].execution_frequency,
@@ -2206,7 +2212,7 @@
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] =""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
@@ -2522,7 +2528,6 @@
                         id: prescription.project[b].id,
                         project_id: prescription.project[b].project_id,
                         project_name: prescription.project[b].project.project_name,
-                        statistical_classification: prescription.project[b].project.statistical_classification,
                         single_dose: prescription.project[b].single_dose,
                         delivery_way: prescription.project[b].delivery_way,
                         execution_frequency: prescription.project[b].execution_frequency,
@@ -2536,13 +2541,16 @@
                       }
 
                       if (prescription.project[b].type == 2) {
-                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
                         obj['medical_code'] = prescription.project[b].project.medical_code
                         obj['project_name'] = prescription.project[b].project.project_name
                         obj['project'] = prescription.project[b].project
 
                       } else if (prescription.project[b].type == 3) {
-                        obj['statistical_classification'] = ''
+                        if(prescription.project[b].team_id > 0){
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                        }
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                         obj['project_name'] = prescription.project[b].good_info.good_name
                         obj['good_info'] = prescription.project[b].good_info
@@ -2648,7 +2656,6 @@
                           id: 0,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -2661,7 +2668,7 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = ''
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['price'] = prescription.project[b].project.price
@@ -3037,7 +3044,6 @@
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -3051,13 +3057,16 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] = prescription.project[b].project
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] = prescription.project[b].good_info
@@ -3170,7 +3179,6 @@
                             id: 0,
                             project_id: prescription.project[b].project_id,
                             project_name: prescription.project[b].project.project_name,
-                            statistical_classification: prescription.project[b].project.statistical_classification,
                             single_dose: prescription.project[b].single_dose,
                             delivery_way: prescription.project[b].delivery_way,
                             execution_frequency: prescription.project[b].execution_frequency,
@@ -3183,7 +3191,7 @@
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
@@ -3466,7 +3474,6 @@
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
@@ -3480,13 +3487,16 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] = prescription.project[b].project
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] = prescription.project[b].good_info
@@ -3600,7 +3610,6 @@
                             id: 0,
                             project_id: prescription.project[b].project_id,
                             project_name: prescription.project[b].project.project_name,
-                            statistical_classification: prescription.project[b].project.statistical_classification,
                             single_dose: prescription.project[b].single_dose,
                             delivery_way: prescription.project[b].delivery_way,
                             execution_frequency: prescription.project[b].execution_frequency,
@@ -3613,7 +3622,7 @@
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -486,7 +486,7 @@
   import { uParseTime } from '@/utils/tools'
   import NextOrLastPrescription from './nextOrLastPrescription'
   import CallPrescription from './callPrescription'
-  import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
+  import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'    
 
   const moment = require('moment')
 

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

@@ -86,18 +86,18 @@
         ></el-table-column>
       </el-table>
 
-      <el-pagination
-        align="right"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="listQuery.page"
-        :page-sizes="[20, 40, 60, 80,100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
+<!--      <el-pagination-->
+<!--        align="right"-->
+<!--        @size-change="handleSizeChange"-->
+<!--        @current-change="handleCurrentChange"-->
+<!--        :current-page="listQuery.page"-->
+<!--        :page-sizes="[20, 40, 60, 80,100]"-->
+<!--        :page-size="10"-->
+<!--        background-->
+<!--        style="margin-top:20px;"-->
+<!--        layout="total, sizes, prev, pager, next, jumper"-->
+<!--        :total="total"-->
+<!--      ></el-pagination>-->
     </div>
   </div>
 </template>
@@ -296,6 +296,7 @@ export default {
       geStatistics(this.listQuery).then(response=>{
 
         if(response.data.state === 1){
+          this.tableData = []
           var statistics =  response.data.data.statistics
           var treatinfo = response.data.data.treatinfo
           this.total =  response.data.data.total
@@ -310,7 +311,7 @@ export default {
                 }
             })
          let list = Object.values(dataInfo)
-      
+
          list.map(item=>{
            for(let i=0;i<statistics.length;i++){
              if(item.date == statistics[i].date){
@@ -333,12 +334,12 @@ export default {
               dd[dtd[index].date][dtd[index].mode_id] = dtd[index];
             }
           }
-          
+
           for (const key in dd) {
             var total = 0;
             for (const mkey in this.modeOptions) {
               if (mkey in dd[key]) {
-               
+
                 console.log(this.modeOptions[mkey].name)
                 dd[key][mkey].mode = this.modeOptions[mkey].name;
                 var number = parseInt(dd[key][mkey].number);
@@ -355,13 +356,12 @@ export default {
                 };
               }
             }
-            this.tableData = []
             this.tableData.push({ date: key, data: dd[key], total: total });
           }
         }
        })
     },
- 
+
   },
   created(){
     this.modeOptions = this.$store.getters.treatment_mode;