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/outpatientChargesManagement.vue

                             <template slot-scope="scope">{{scope.row.name}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="就诊号" width="110">
-                            <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}
+                            <template slot-scope="scope">{{ scope.row ?scope.row.number:''}}
                             </template>
                         </el-table-column>
                     </el-table>
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
-              if (response.data.data.list[i].his_patient.order.order_status == 2) {
+              if (response.data.data.list[i].order.order_status == 2) {
                 two_count = two_count + 1
               }
 
                 this.patientTableData = []
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1) {
+                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
                 }
                 if (this.patientTableData.length > 0) {
                   for (let i = 0; i < this.patientTableData.length; i++) {
-                    if (this.patientTableData[i].id == this.patientInfo.id) {
+                    if (this.patientTableData[i].patient_id == this.patientInfo.id) {
                       this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                      this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id)
+                      this.getPatientInformation(this.patientTableData[i].patient_id, this.patientTableData[i].order.number, this.patientTableData[i].id)
                     }
                   }
                 }
 
             for (let i = 0; i < response.data.data.list_two.length; i++) {
               this.hisPatientDatas.push(response.data.data.list_two[i])
-              if (response.data.data.list_two[i].his_patient.order.order_status == 0 || response.data.data.list_two[i].his_patient.order.order_status == 1 || response.data.data.list_two[i].his_patient.order.order_status == 3) {
+              if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1 || response.data.data.list_two[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
-              if (response.data.data.list_two[i].his_patient.order.order_status == 2) {
+              if (response.data.data.list_two[i].order.order_status == 2) {
                 two_count = two_count + 1
               }
 
                 this.patientTableData = []
 
                 for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].his_patient.order.order_status == 0 || this.hisPatientDatas[i].his_patient.order.order_status == 1 || this.hisPatientDatas[i].his_patient.order.order_status == 3) {
+                  if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1 || this.hisPatientDatas[i].order.order_status == 3) {
                     this.patientTableData.push(this.hisPatientDatas[i])
                   }
 
                 }
                 if (this.patientTableData.length > 0) {
                   for (let i = 0; i < this.patientTableData.length; i++) {
-                    if (this.patientTableData[i].id == this.patientInfo.id) {
+                    if (this.patientTableData[i].patient_id == this.patientInfo.id) {
                       this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                      this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id)
+                      this.getPatientInformation(this.patientTableData[i].patient_id, this.patientTableData[i].order.number, this.patientTableData[i].id)
                     }
                   }
                 }
 
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
               case 1:
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1) {
+                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
                 }
                 for (let i = 0; i < this.patientTableData.length; i++) {
-                  if (this.patientInfo.id == this.patientTableData[i].id) {
+                  if (this.patientInfo.id == this.patientTableData[i].patient_id) {
                     this.current_index = i
                     this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                    this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].his_patient.order.number, this.patientTableData[i].his_patient.id)
+                    this.getPatientInformation(this.patientTableData[i].patient_id, this.patientTableData[i].order.number, this.patientTableData[i].id)
 
                   }
                 }
 
               for (let i = 0; i < response.data.data.list.length; i++) {
                 this.all_table_data.push(response.data.data.list[i])
-                if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+                if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                   one_count = one_count + 1
                 }
 
 
               for (let i = 0; i < response.data.data.list_two.length; i++) {
                 this.hisPatientDatas.push(response.data.data.list_two[i])
-                if (response.data.data.list_two[i].his_patient.order.order_status == 0 || response.data.data.list_two[i].his_patient.order.order_status == 1) {
+                if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1) {
                   one_count = one_count + 1
                 }
 
                 if (this.activeName == 'first') {
 
                   for (let i = 0; i < this.all_table_data.length; i++) {
-                    if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1) {
+                    if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
                       this.patientTableData.push(this.all_table_data[i])
                     }
 
 
                 } else {
                   for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                    if (this.hisPatientDatas[i].his_patient.order.order_status == 0 || this.hisPatientDatas[i].his_patient.order.order_status == 1) {
+                    if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1) {
                       this.patientTableData.push(this.hisPatientDatas[i])
                     }
 
 
                 this.current_index = 0
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
-                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].his_patient.order.number, this.patientTableData[0].his_patient.id)
+                this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].order.number, this.patientTableData[0].id)
 
                 break
               case 2:
             let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].his_patient.order.order_status == 0 || response.data.data.list[i].his_patient.order.order_status == 1 || response.data.data.list[i].his_patient.order.order_status == 3) {
+              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
                 one_count = one_count + 1
               }
 
               case 1:
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].his_patient.order.order_status == 0 || this.all_table_data[i].his_patient.order.order_status == 1 || this.all_table_data[i].his_patient.order.order_status == 3) {
+                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1 || this.all_table_data[i].order.order_status == 3) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
                 }
 
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
-                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].his_patient.order.number, this.patientTableData[0].his_patient.id)
+                this.getPatientInformation(this.patientTableData[0].patient_id, this.patientTableData[0].order.number, this.patientTableData[0].id)
 
                 break
               case 2:
         this.prescriptions = []
         this.month_prescriptions = []
         if(this.radio == 1){
-          this.getPatientInformation(val.id, val.his_patient.order.number, val.his_patient.id)
+          this.getPatientInformation(val.patient_id, val.order.number, val.id)
         }else{
           this.getPatientInformation(val.id, val.number, val.his_patient_id)
 

src/xt_pages/outpatientTool/components/detail.vue

                     <!--</el-button>-->
                     <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                               @keyup.enter.native='searchAction'
+                              placeholder="请输入患者姓名"
                               class="filter-item"/>
                     <el-select size="small" v-model="item_type" placeholder="请选择"
                                style="width:150px;margin-left:10px;" @change="changeItem">
             <el-table :data="tableData" border :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       :span-method="merge"
+                      show-summary
+                      :summary-method="getTotal"
+                      max-height="600"
+
                       v-loading="detail_loading"
                       highlight-current-row>
 
                     </template>
                 </el-table-column>
 
-                <el-table-column align="center" prop="name" label="费用总额">
+                <el-table-column align="center" prop="total" label="费用总额">
                     <template slot-scope="scope">
                         <div>{{scope.row.total.toFixed(2)}}</div>
                     </template>
       return {
         detail_loading:false,
         tempArr: [],
+        pos:0,
+
         sameRowArr: [],
         keywords: '',
         tableData: [],
                   newObj['price'] = orders[b].order_info[c].pric
                   if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
                     newObj['type'] = 1
-                    newObj['item_name'] = orders[b].order_info[c].advice.advice_name
+                    // newObj['item_name'] = orders[b].order_info[c].advice.advice_name
                     newObj['item_id'] = orders[b].order_info[c].advice.drug_id
 
+                    if(orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
+                      newObj['item_name'] = orders[b].order_info[c].advice.advice_name + "（ " + orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + "*" + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + "/" + orders[b].order_info[c].advice.drug.max_unit + " ）"
+                    }else{
+
+                      newObj['item_name'] = ""
+                    }
+
+
                   }
                   if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
                     newObj['type'] = 2
 
                     if (orders[b].order_info[c].project.type == 2) {
                       newObj['item_name'] = orders[b].order_info[c].project.project.project_name
+
+
                     } else if (orders[b].order_info[c].project.type == 3) {
                       newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name + "（ "+ orders[b].order_info[c].project.good_info.specification_name+" ）"
+
+
                     }
                   }
                   obj.order_info.push(newObj)
               }
               tempPatientsTwo.push(obj)
             }
-            console.log(tempPatientsTwo)
+
 
             for (let d = 0; d < tempPatientsTwo.length; d++) {
               tempPatientsTwo[d]['new_order_info'] = []
             for (let i = 0; i < tempPatientsTwo.length; i++) {
               let total = 0
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                if (tempPatientsTwo[i].new_order_info[b].item_name.length != 0) {
+                let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                new_name=new_name.replace("（ ","");
+                new_name=new_name.replace(" ）","");
+                if (new_name.length != 0) {
                   total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
                 }
               }
             for (let i = 0; i < tempPatientsTwo.length; i++) {
               console.log(tempPatientsTwo[i].total)
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                if (tempPatientsTwo[i].new_order_info[b].item_name.length != 0) {
+                let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                new_name=new_name.replace("（ ","");
+                new_name=new_name.replace(" ）","");
+
+                if (new_name.length != 0) {
                   let obj = {
                     name: tempPatientsTwo[i].name,
                     patient_id: tempPatientsTwo[i].patient_id,
                     item_name: tempPatientsTwo[i].new_order_info[b].item_name,
                     item_id: tempPatientsTwo[i].new_order_info[b].item_id,
                     count: tempPatientsTwo[i].new_order_info[b].count,
-                    total: tempPatientsTwo[i].total
+
+                  }
+                  if(b == 0){
+                    obj['total'] =  tempPatientsTwo[i].total
+                  }else{
+                    obj['total'] = 0
                   }
                   this.tableData.push(obj)
                 }
             colspan: _col
           }
         }
+      }, getTotal(param) {
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+            return
+          }
+          console.log(data)
+          const values = data.map(item => Number(item[column.property]))
+          if (column.property === 'total') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] = sums[index].toFixed(2)
+          } else {
+            sums[index] = ''
+          }
+        })
+
+        return sums
       }
     },
     created() {

src/xt_pages/outpatientTool/components/gather.vue

                     <!--</el-button>-->
                     <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                               @keyup.enter.native='searchAction'
+                              placeholder="请输入患者姓名"
+
                               class="filter-item"/>
                     <el-select size="small" v-model="item_type" placeholder="请选择"
                                style="width:150px;margin-left:10px;" @change="changeItem">
         tempArr: [],
         sameRowArr: [],
         keywords: '',
+        pos:0,
 
         tableData: [],
         chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
                   obj['patient_id'] = tempPatientsTwo[d].patient_id
                   this.tableData.push(obj)
 
-                  obj2['sum'] = price + price2 + price3
+                  obj2['sum'] = 0
                   obj2['price'] = price2
                   obj2['item_name'] = '药品'
                   obj2['name'] = tempPatientsTwo[d].name
                   obj2['patient_id'] = tempPatientsTwo[d].patient_id
                   this.tableData.push(obj2)
 
-                  obj3['sum'] = price + price2 + price3
+                  obj3['sum'] = 0
                   obj3['price'] = price3
                   obj3['item_name'] = '耗材'
                   obj3['name'] = tempPatientsTwo[d].name
             sums[index] = '合计'
             return
           }
+          console.log(data)
           const values = data.map(item => Number(item[column.property]))
           if (column.property === 'sum') {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {
-                return prev+ curr
+                return prev + curr
               } else {
                 return prev
               }
             }, 0)
             sums[index] = sums[index].toFixed(2)
           } else {
-            sums[index] = '--'
+            sums[index] = ''
           }
         })
 

src/xt_pages/outpatientTool/components/settle.vue

                     <!--</el-button>-->
                     <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                               @keyup.enter.native='searchAction'
+                              placeholder="请输入患者姓名"
                               class="filter-item"/>
                     <el-select size="small" v-model="item_type" placeholder="请选择"
                                style="width:150px;margin-left:10px;" @change="changeItem">
                     </template>
                 </el-table-column>
 
-                <el-table-column align="center" prop="item_name" label="结算类型">
+                <el-table-column align="center" prop="is_medicine_insurance" label="结算类型">
                     <template slot-scope="scope">
                         <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
                         <div v-if="scope.row.is_medicine_insurance == 1">医保</div>
                     </template>
                 </el-table-column>
-                <el-table-column align="center" prop="item_name" label="处方类型">
+                <el-table-column align="center" prop="med_type" label="处方类型">
                     <template slot-scope="scope">
                         <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
                         <div v-if="scope.row.med_type == '11'">普通门诊</div>
                     </template>
                 </el-table-column>
-                <el-table-column align="center" prop="item_name" label="医疗费总额">
+                <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">
                     <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="item_name" label="基金支付金额">
+                <el-table-column align="center" prop="fund_pay_sumamt" label="基金支付金额">
                     <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="item_name" label="个人账户支付金额">
+                <el-table-column align="center" prop="acct_pay" label="个人账户支付金额">
                     <template slot-scope="scope">{{scope.row.acct_pay}}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="item_name" label="个人支付金额">
+                <el-table-column align="center" prop="psn_cash_pay" label="个人支付金额">
                     <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="total" label="费用总额">
             for (let i = 0; i < data.length; i++) {
               for (let b = 0; b < data[i].orders.length; b++) {
                 let order = data[i].orders[b]
-                order['total'] = data[i].total
+
+                if(b == 0){
+                  order['total'] = data[i].total
+
+                }else{
+                  order['total'] = 0
+
+                }
+
                 this.tableData.push(order)
 
               }
             colspan: _col
           }
         }
-      }, getTotal(param) {
+      },
+      getTotal(param) {
         const { columns, data } = param
         const sums = []
         columns.forEach((column, index) => {
             sums[index] = '合计'
             return
           }
+          console.log(data)
           const values = data.map(item => Number(item[column.property]))
           if (column.property === 'total') {
             sums[index] = values.reduce((prev, curr) => {
             }, 0)
             sums[index] = sums[index].toFixed(2)
           } else {
-            sums[index] = '--'
+            sums[index] = ''
           }
         })