Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/Pharmacy/drugCode.vue

@@ -8,7 +8,7 @@
           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -23,7 +23,7 @@
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;margin-right:10px;"
+          style="width: 150px;margin-right:10px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -33,6 +33,15 @@
       </div>
 
 
+      <div style="width:150px;">
+        <el-input  style="width: 150px"
+                   v-model="keywords" @input="searchAction"
+                   @keyup.enter.native="searchAction"
+                   class="filter-item" placeholder="请输入患者姓名"
+        />
+      </div>
+
+
       <div>
         <div>上传状态:
           <el-select size="small" v-model="is_sale" placeholder="请选择" style="width:100px;" @change="changeStock">
@@ -57,8 +66,24 @@
             </el-option>
           </el-select>
         </div>
+
+
+          <div>是否有溯源码:
+            <el-select size="small" v-model="is_code" placeholder="请选择" style="width:100px;" @change="changeCode">
+              <el-option
+                v-for="item,index in code_items"
+                :key="index"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
       </div>
 
+
+
+
+
       <div>
         <el-button type="primary" @click="batchUpload()">批量上传</el-button>
         <el-button type="primary" @click="query()">查询</el-button>
@@ -199,18 +224,26 @@ export default {
       start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
       end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
       is_settle:"0",
+      is_code:"0",
       tableData: [],
       change_type: "3",
       selection: [],
       page: 1,
       limit: 10,
       value: 0,
+      keywords:"",
       is_sale: "0",
       items: [
         {id: "0", name: '全部'},
         {id: "1", name: '已上传'},
         {id: "2", name: '未上传'},
       ],
+      code_items:[
+        {id: "0", name: '全部'},
+        {id: "2", name: '有溯源码'},
+        {id: "1", name: '无溯源码'},
+
+      ],
       settle_items: [
         {id: "0", name: '全部'},
         {id: "2", name: '已结算'},
@@ -232,6 +265,11 @@ export default {
     }
   },
   methods: {
+    searchAction() {
+      this.page = 1
+
+      this.getlist()
+    },
     toUpload(row) {
       if (row.drug_code.length == 0) {
         this.$message.error("追溯码不能为空");
@@ -595,6 +633,8 @@ export default {
         limit: this.limit,
         is_sale: this.is_sale,
         is_settle:this.is_settle,
+        is_code:this.is_code,
+        keywords:this.keywords,
 
       }
       getHisDrugCodeQueryList(params).then(response => {
@@ -610,6 +650,10 @@ export default {
           this.is_open = response.data.data.codeConfig.is_open
         }
       })
+    },changeCode(val){
+      this.is_code = val
+      this.getlist()
+
     },changeSettle(val){
 
       this.is_settle = val

src/xt_pages/drugSourceCode/drugCodeQuery.vue

@@ -84,6 +84,8 @@
           </template>
         </el-table-column>
 
+
+
         <el-table-column align="center" prop="name" label="发药状态">
           <template slot-scope="scope">
             <div v-if="scope.row.is_medicine == 1">已发药</div>
@@ -91,12 +93,19 @@
           </template>
         </el-table-column>
 
+
+        <el-table-column align="center" prop="name" label="结算状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.pre.order_status == 2">已结算</div>
+            <div v-if="scope.row.pre.order_status != 2">未结算</div>
+          </template>
+        </el-table-column>
+
         <el-table-column align="center" prop="name" label="操作" width="200">
           <template slot-scope="scope">
             <div>
              <el-button v-if="scope.row.is_upload == 1" type="primary" @click="revokeDrugCode(scope.row)">撤销</el-button>
             <el-button type="primary" v-if="scope.row.is_upload == 0" @click="toUpload(scope.row)">上传</el-button>
-<!--            <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>-->
             </div>
           </template>
         </el-table-column>
@@ -115,8 +124,6 @@
 
 
 
-
-
       <el-dialog
         title="药品追溯码"
         :visible.sync="dialogVisibleOne"
@@ -453,7 +460,7 @@
           } else {
 
             //有打开则调用接口
-            axios.get('http://127.0.0.1:9532/api/delete_xs_bg_three',{params:params}).then(function(response) {
+            axios.get('http://127.0.0.1:9532/api/changedrug/five',{params:params}).then(function(response) {
               if (response.data.state == 0) {
                 that.$message.error(response.data.data.msg);
                 return false

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -65,7 +65,7 @@
       <!-- 广水原生堂 -->
       <printfourteen :info="info" v-if="(org_id == 10088 ) && this.paramsObj.balance_accounts_type == 1"></printfourteen>
       <!-- 盱眙恒硕 -->
-      <printfivetheen :info="info" v-if="org_id == 10633"></printfivetheen>
+      <printfivetheen :info="info" v-if="org_id == 10633 || org_id == 0"></printfivetheen>
       <!-- 顺有好 -->
       <printSixtheen :info="info" v-if="org_id == 10697"></printSixtheen>
       <!-- 杏康 -->
@@ -76,13 +76,9 @@
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&
             org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&
-            org_id != 10510 &&org_id != 10088 && org_id != 10721 &&org_id != 10633 &&org_id != 10731 && org_id != 10726 && this.paramsObj.balance_accounts_type == 1">
+            org_id != 10510 &&org_id != 10088 && org_id != 10721 &&org_id != 0 &&org_id != 10633 &&org_id != 10731 && org_id != 10726 && this.paramsObj.balance_accounts_type == 1">
       </printOne>
-      <privateChargePrint :info="info" v-if="org_id != 9990 &&
-            org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
-            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
-            org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
-            org_id != 10510 &&org_id != 10633 && org_id != 10721 && org_id != 10726  && this.paramsObj.balance_accounts_type == 2">
+      <privateChargePrint :info="info" v-if="this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
     </div>
   </div>
@@ -2203,6 +2199,387 @@ export default {
 
 
 
+          } else if(this.org_id == 10633 || this.org_id == 0){
+            let params = {
+              order_id: obj.order_id,
+              admin_user_id: this.$store.getters.xt_user.user.id
+            }
+            getPrivateExpensesOrder(params).then((response) => {
+              if (response.data.state == 0) {
+                // this.$message.error(response.data.msg)
+
+                return false
+              } else {
+                var that = this
+                that.info = response.data.data.info
+                that.p_admin = response.data.data.printor_admin
+                that.charge_admin = response.data.data.charge_admin
+                that.info['new_order'] = response.data.data.info
+                that.info['p_admin'] = that.p_admin
+                that.info['charge_admin'] = that.charge_admin
+                that.info['order_number'] = response.data.data.order_number
+                that.info['patient'] = response.data.data.patient
+                that.info['date'] = response.data.data.date
+                that.info['number'] = response.data.data.number
+                that.info['order_infos'] = response.data.data.order_infos
+                that.info['diagnosis'] = response.data.data.diagnosis
+                that.info['fixmedins_name'] = response.data.data.org_name
+                that.info['fixmedins_code'] = response.data.data.org_code
+                // that.info["doctor_code"] = response.data.data.doctor_code;
+                // that.info["department"] = response.data.data.department;
+                // that.info["health_card_no"] = response.data.data.health_card_no;
+
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal
+                that.info['bed_cost_self_total'] =
+                  response.data.data.bedCostSelfTotal
+                that.info['bed_cost_part_self_total'] =
+                  response.data.data.bedCostPartSelfTotal
+
+                that.info['operation_cost_total'] =
+                  response.data.data.operationCostTotal
+                that.info['operation_cost_self_total'] =
+                  response.data.data.operationCostSelfTotal
+                that.info['operation_cost_part_self_total'] =
+                  response.data.data.operationCostPartSelfTotal
+
+                that.info['other_cost_total'] = response.data.data.otherCostTotal
+                that.info['other_cost_self_total'] =
+                  response.data.data.otherCostSelfTotal
+                that.info['other_cost_part_self_total'] =
+                  response.data.data.otherCostPartSelfTotal
+
+                that.info['material_cost_total'] =
+                  response.data.data.materialCostTotal
+                that.info['material_cost_self_total'] =
+                  response.data.data.materialCostSelfTotal
+                that.info['material_cost_part_self_total'] =
+                  response.data.data.materialCostPartSelfTotal
+
+                that.info['western_medicine_cost_total'] =
+                  response.data.data.westernMedicineCostTotal
+                that.info['western_medicine_cost_self_total'] =
+                  response.data.data.westernMedicineCostSelfTotal
+                that.info['western_medicine_cost_part_self_total'] =
+                  response.data.data.westernMedicineCostPartSelfTotal
+
+                that.info['chinese_traditional_medicine_cost_total'] =
+                  response.data.data.chineseTraditionalMedicineCostTotal
+                that.info['chinese_traditional_medicine_cost_self_total'] =
+                  response.data.data.chineseTraditionalMedicineCostSelfTotal
+                that.info['chinese_traditional_medicine_cost_part_self_total'] =
+                  response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+
+                that.info['check_cost_total'] = response.data.data.checkCostTotal
+                that.info['check_cost_self_total'] =
+                  response.data.data.checkCostSelfTotal
+                that.info['check_cost_part_self_total'] =
+                  response.data.data.checkCostPartSelfTotal
+
+                that.info['laboratory_cost_total'] =
+                  response.data.data.laboratoryCostTotal
+                that.info['laboratory_cost_self_total'] =
+                  response.data.data.laboratoryCostSelfTotal
+                that.info['laboratory_cost_part_self_total'] =
+                  response.data.data.laboratoryCostPartSelfTotal
+
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal
+                that.info['treat_cost_self_total'] =
+                  response.data.data.treatCostSelfTotal
+                that.info['treat_cost_part_self_total'] =
+                  response.data.data.treatCostPartSelfTotal
+
+
+                that.info['bedInscpTotal'] =
+                  response.data.data.bedInscpTotal
+                that.info['bedSelfTotal'] =
+                  response.data.data.bedSelfTotal
+
+                that.info['operationInscpTotal'] =
+                  response.data.data.operationInscpTotal
+                that.info['operationSelfTotal'] =
+                  response.data.data.operationSelfTotal
+
+                that.info['checkInscpTotal'] =
+                  response.data.data.checkInscpTotal
+                that.info['checkSelfTotal'] =
+                  response.data.data.checkSelfTotal
+
+                that.info['treatInscpTotal'] =
+                  response.data.data.treatInscpTotal
+                that.info['treatSelfTotal'] =
+                  response.data.data.treatSelfTotal
+
+                that.info['laboratoryInscpTotal'] =
+                  response.data.data.laboratoryInscpTotal
+                that.info['laboratorySelfTotal'] =
+                  response.data.data.laboratorySelfTotal
+
+                that.info['westernMedicineInscpTotal'] =
+                  response.data.data.westernMedicineInscpTotal
+                that.info['westernMedicineSelfTotal'] =
+                  response.data.data.westernMedicineSelfTotal
+
+                that.info['materialInscpTotal'] =
+                  response.data.data.materialInscpTotal
+                that.info['materialSelfTotal'] =
+                  response.data.data.materialSelfTotal
+
+                that.info['chineseTraditionalInscpTotal'] =
+                  response.data.data.chineseTraditionalInscpTotal
+                that.info['chineseTraditionalSelfTotal'] =
+                  response.data.data.chineseTraditionalSelfTotal
+
+
+
+                that.info['date'] = response.data.data.date
+                that.info['number'] = response.data.data.number
+                that.info['order_infos'] = response.data.data.order_infos
+                that.info['diagnosis'] = response.data.data.diagnosis
+                that.info['his'] = response.data.data.his
+                that.info['dia_config'] = response.data.data.dia_config
+
+                const jsonArr = JSON.parse(response.data.data.his.idetinfo);
+                that.info['psn_idet_type'] = jsonArr[0].psn_idet_type
+
+
+                const jsons = JSON.parse(response.data.data.his.iinfo);
+                that.info['emp_name'] = jsons[0].emp_name
+
+
+
+
+
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  if (response.data.data.order_infos[i].advice_id > 0 && response.data.data.order_infos[i].project_id == 0) {
+                    response.data.data.order_infos[i].med_chrgitm_type = '09'
+                  }
+                  if (response.data.data.order_infos[i].advice_id == 0 && response.data.data.order_infos[i].project_id > 0) {
+                    if (response.data.data.order_infos[i].project.type == 2) { //项目
+                      if (response.data.data.order_infos[i].project.project.cost_classify == 2) {
+                        response.data.data.order_infos[i].med_chrgitm_type = '05'
+                      } else if (response.data.data.order_infos[i].project.project.cost_classify == 3) {
+                        response.data.data.order_infos[i].med_chrgitm_type = '04'
+                      } else {
+                        response.data.data.order_infos[i].med_chrgitm_type = '14'
+                      }
+                    } else if (response.data.data.order_infos[i].project.type == 3) { //耗材
+                      response.data.data.order_infos[i].med_chrgitm_type = '08'
+                    }
+                  }
+                }
+                console.log(response.data.data.order_infos)
+                console.log(that.info)
+
+                let list = []
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  let order = response.data.data.order_infos[i]
+                  let obj = {
+                    name: '',
+                    spec: '',
+                    cnt: '',
+                    det_item_fee_sumamt: '',
+                    price:'',
+                  }
+
+                  if (order.advice_id > 0 && order.project_id == 0) {
+                    obj.name = order.advice.advice_name
+                    let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+                    obj.spec = spec
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                    obj.price = order.pric
+                    list.push(obj)
+
+                  } else if (order.advice_id == 0 && order.project_id > 0) {
+                    if (order.project.type == 2) {
+                      obj.name = order.project.project.project_name
+                      obj.spec = ''
+                      obj.cnt = order.cnt
+                      obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                      obj.price = order.pric
+                    } else {
+                      obj.name = order.project.good_info.good_name
+                      obj.spec = order.project.good_info.specification_name
+                      obj.cnt = order.cnt
+                      obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                      obj.price = order.pric
+                    }
+                    list.push(obj)
+                  }
+
+                }
+                that.info['Z_list'] = list
+                console.log(" that.info")
+                console.log(that.info.Z_list)
+                console.log(" that.info")
+
+
+                //获取所有项目类型进行去重
+                let med_chrgitm_types = []
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  med_chrgitm_types.push(response.data.data.order_infos[i].med_chrgitm_type)
+                }
+                const obj10 = {}
+                med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                  obj10[next] ? '' : obj10[next] = true && cur.push(next)
+                  return cur
+                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+                let tempOrderInfo = []
+                for (let i = 0; i < med_chrgitm_types.length; i++) {
+
+                  let obj9 = {
+                    details: [],
+                    med_chrgitm_name: that.getType(med_chrgitm_types[i]),
+                    total:0,
+                  }
+
+                  // if(med_chrgitm_types[i] == '09'){
+                  //   obj.sort = 99
+                  // } else if(med_chrgitm_types[i] == '05'){
+                  //   obj.sort = 98
+                  // } else if(med_chrgitm_types[i] == '08'){
+                  //   obj.sort = 97
+                  // }else if(med_chrgitm_types[i] == '03'){
+                  //   obj.sort = 96
+                  // }
+
+                  let tempDetails = []
+                  for (let b = 0; b < response.data.data.order_infos.length; b++) {
+                    if (med_chrgitm_types[i] == response.data.data.order_infos[b].med_chrgitm_type) {
+                      tempDetails.push(response.data.data.order_infos[b])
+                    }
+                  }
+                  console.log(med_chrgitm_types[i])
+                  console.log(tempDetails)
+                  obj9.total = that.getTotal(tempDetails)
+                  obj9.details = that.set10265NewData(tempDetails)
+                  list.push(obj9)
+                }
+                that.info['new_list'] = list
+                // list.sort((a,b) => a.sort < b.sort ? 1 : a.sort > b.sort ? -1 : 0)
+
+                let obj = {
+                  type: 1,
+                  details: [],
+                  total: 0
+                }
+                let obj2 = {
+                  type: 2,
+                  details: [],
+                  total: 0
+                }
+                let obj3 = {
+                  type: 3,
+                  details: [],
+                  total: 0
+                }
+
+                let obj4 = {
+                  type: 4,
+                  details: [],
+                  total: 0
+                }
+                let num = 0
+                that.info.order_infos.map((item) => {
+                  if (item.advice_id > 0) {
+                    obj.details.push(item)
+                    obj.total += item.pric * item.advice.prescribing_number
+                    num++
+                  } else {
+                    if (item.project.type == 2) {
+                      obj2.details.push(item)
+                      obj2.total += item.pric * item.project.count
+                      num++
+                    } else {
+                      obj3.details.push(item)
+                      obj3.total += item.pric * item.project.count
+                      num++
+                    }
+                  }
+                })
+
+                // this.info.order_infos.map(item => {
+                //   obj4.total = item.Total
+                //   obj4.details.push(item)
+                //   num++
+                //
+                // })
+                var funds = []
+                for(let i = 0; i <  response.data.data.funds.length; i++){
+                  var objs = {}
+                  objs["number"] = i + 1
+                  objs["fund_pay"] = response.data.data.funds[i].fund_payamt
+                  objs["limit_pay"] = response.data.data.funds[i].inscp_scp_amt
+                  objs["insp_pay"] = response.data.data.funds[i].inscp_scp_amt
+                  for(let b = 0; b < that.fundsArray.length; b++){
+                    if(response.data.data.funds[i].fund_pay_type ==  that.fundsArray[b].code){
+                      objs["name"] =that.fundsArray[b].name
+                    }
+                  }
+                  funds.push(objs)
+                }
+                that.info['funds'] = funds
+                console.log(that.info)
+
+                that.info.new_detail_list = []
+                that.info.new_detail_list.push(obj)
+                that.info.new_detail_list.push(obj2)
+                that.info.new_detail_list.push(obj3)
+                // that.info.new_detail_list.push(obj4)
+
+                that.num = num
+
+                if (that.paramsObj.settle_type != 1) {
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
+                }
+
+                that.info.order_infos.map((item) => {
+
+                })
+
+
+                that.info["jia_drug"] = 0
+                that.info["yi_drug"] = 0
+                that.info["zifei_drug"] = 0
+
+
+                that.info["jia_yiliao"] = 0
+                that.info["yi_yiliao"] = 0
+                that.info["zifei_yiliao"] = 0
+
+                for(let a = 0; a < response.data.data.order_infos.length; a++){
+                  if(response.data.data.order_infos[a].chrgitm_lv == "01" && response.data.data.order_infos[a].med_chrgitm_type == "09"){
+                    that.info["jia_drug"] = that.info["jia_drug"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                  if(response.data.data.order_infos[a].chrgitm_lv == "02" && response.data.data.order_infos[a].med_chrgitm_type == "09"){
+                    that.info["yi_drug"] = that.info["yi_drug"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                  if(response.data.data.order_infos[a].chrgitm_lv != "01" && response.data.data.order_infos[a].chrgitm_lv != "02" && response.data.data.order_infos[a].med_chrgitm_type == "09"){
+                    that.info["zifei_drug"] = that.info["zifei_drug"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                }
+
+                for(let a = 0; a < response.data.data.order_infos.length; a++){
+                  if(response.data.data.order_infos[a].chrgitm_lv == "01" && response.data.data.order_infos[a].med_chrgitm_type != "09"){
+                    that.info["jia_yiliao"] = that.info["jia_yiliao"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                  if(response.data.data.order_infos[a].chrgitm_lv == "02" && response.data.data.order_infos[a].med_chrgitm_type != "09"){
+                    that.info["yi_yiliao"] = that.info["yi_yiliao"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                  if(response.data.data.order_infos[a].chrgitm_lv != "01" && response.data.data.order_infos[a].chrgitm_lv != "02" && response.data.data.order_infos[a].med_chrgitm_type != "09"){
+                    that.info["zifei_yiliao"] = that.info["zifei_yiliao"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                }
+
+              }
+            })
+
+
+
+
+
+
           }else {
             var that = this
             axios

src/xt_pages/outpatientCharges/statementTemplate/printfivetheen.vue

@@ -3,7 +3,7 @@
     <div class="statementTitle">淮安市国家医保结算单</div>
     <div style="display: flex;">
       <div style="margin: 10px 0;flex: 1;">定点医疗机构:{{info.fixmedins_name}}</div>
-      <div style="margin: 10px 0;flex: 1;">统筹区号:</div>
+      <div style="margin: 10px 0;flex: 1;">统筹区号:320830</div>
       <div style="margin: 10px 0;flex: 1;">NO:</div>
     </div>
     <table class="statementTable" border="1" style="text-align: center;width: 100%;">
@@ -13,9 +13,9 @@
         <td width="5%">性别:</td>
         <td width="6%">{{ info.gend == '1' ? '男':'女' }}</td>
         <td width="14%">医保就诊号:</td>
-        <td width="13%">{{ }}</td>
+        <td width="13%">{{info.mdtrt_id}}</td>
         <td width="12%">住院次数:</td>
-        <td width="15%">{{ }}</td>
+        <td width="15%"></td>
       </tr>
       <tr>
         <td width="12">人员类别:</td>
@@ -54,7 +54,7 @@
           <span v-else></span>
         </td>
         <td width="8">状态:</td>
-        <td width="8">{{ }}</td>
+        <td width="8">出院</td>
         <td width="14">住院号:</td>
         <td width="12">{{info.number}}</td>
         <td width="12">结算日期:</td>
@@ -64,33 +64,33 @@
         <td >身份证号</td>
         <td colspan="3">{{info.certno}}</td>
         <td width="8">医保编号</td>
-        <td colspan="3">{{  }}</td>
+        <td colspan="3">{{info.psn_no}}</td>
       </tr>
       <tr>
         <td >单位名称</td>
         <td colspan="4">{{info.patient.home_address}}</td>
         <td width="8">人员身份类别</td>
-        <td colspan="2">{{  }}</td>
+        <td colspan="2"></td>
       </tr>
       <tr>
-        <td >入院日期</td>
-        <td colspan="3">{{ }}</td>
+        <td >出院日期</td>
+        <td colspan="3">{{info.setl_time.split(' ')[0]}}</td>
         <td width="8">出院诊断</td>
-        <td colspan="3">{{  }}</td>
+        <td colspan="3">慢性肾脏病5期(N18.500)</td>
       </tr>
       <tr>
         <td>医疗费总额</td>
         <td colspan="3">{{info.medfee_sumamt}}</td>
         <td>全自费金额</td>
-        <td></td>
+        <td>{{info.fulamt_ownpay_amt}}</td>
         <td>超限价自费费用</td>
-        <td></td>
+        <td>{{info.overlmt_self_pay}}</td>
       </tr>
       <tr>
         <td>先行自付金额</td>
         <td colspan="3">{{info.preselfpay_amt}}</td>
         <td>符合政策范围金额</td>
-        <td>{{info.insp_pay}}</td>
+        <td>{{info.inscp_scp_amt}}</td>
         <td>实际支付起付线</td>
         <td>{{info.act_pay_dedc}}</td>
       </tr>
@@ -100,7 +100,7 @@
         <td>公务员医疗补助资金支出</td>
         <td>{{info.cvlserv_pay}}</td>
         <td>扶贫保险支出</td>
-        <td></td>
+        <td>0</td>
       </tr>
       <tr>
         <td>企业补充医疗保险基金支出</td>
@@ -110,35 +110,35 @@
           {{info.hifmi_pay}}
         </td>
         <td>职工大额医疗费用补助基金支出</td>
-        <td></td>
+        <td>{{info.hifob_pay}}</td>
       </tr>
       <tr>
         <td>医疗救助基金支出</td>
         <td colspan="3">{{info.maf_pay}}</td>
         <td>医院负担金额</td>
-        <td></td>
+        <td>{{info.hosp_part_amt}}</td>
         <td>基金支付总额</td>
         <td>{{info.fund_pay_sumamt}}</td>
       </tr>
       <tr>
         <td>甲类药品</td>
-        <td colspan="3"></td>
+        <td colspan="3">{{info.jia_drug.toFixed(2)}}</td>
         <td>乙类药品</td>
-        <td></td>
+        <td>{{info.yi_drug.toFixed(2)}}</td>
         <td>自费药品</td>
-        <td></td>
+        <td>{{info.zifei_drug.toFixed(2)}}</td>
       </tr>
       <tr>
         <td>甲类医疗</td>
-        <td colspan="3"></td>
+        <td colspan="3">{{info.jia_yiliao.toFixed(2)}}</td>
         <td>乙类医疗</td>
-        <td></td>
+        <td>{{info.yi_yiliao.toFixed(2)}}</td>
         <td>自费医疗</td>
-        <td></td>
+        <td>{{info.zifei_yiliao.toFixed(2)}}</td>
       </tr>
       <tr>
         <td>个人负担总金额</td>
-        <td colspan="3"></td>
+        <td colspan="3">{{info.psn_part_amt}}</td>
         <td>个人账户支出</td>
         <td>{{info.acct_pay}}</td>
         <td>个人现金支出</td>
@@ -148,27 +148,27 @@
       </tr>
       <tr>
         <td>补偿合计</td>
-        <td colspan="5">{{ numberToChinese(100) }}</td>
-        <td colspan="2"></td>
+        <td colspan="5">{{ numberToChinese(info.fund_pay_sumamt) }}</td>
+        <td colspan="2">{{info.fund_pay_sumamt}}</td>
       </tr>
       <tr>
         <td>自理合计</td>
-        <td colspan="5"></td>
-        <td colspan="2"></td>
+        <td colspan="5">{{numberToChinese(info.psn_cash_pay)}}</td>
+        <td colspan="2">{{info.psn_cash_pay}}</td>
       </tr>
     </table>
     <table border="1" style="text-align: center;width: 100%;border-collapse: collapse;border-top: none;padding: 5px 0;">
       <tr>
         <td width="10%">政策范围内住院费用</td>
-        <td width="10%">{{ }}</td>
+        <td width="10%">{{info.medfee_sumamt}}</td>
         <td width="10%">政策范围内个人自付费用</td>
-        <td width="10%">{{  }}</td>
+        <td width="10%">{{info.psn_cash_pay}}</td>
         <td width="10%">政策范围内个人自付费用占比</td>
-        <td width="10%">{{ }}</td>
+        <td width="10%">{{((info.psn_cash_pay/info.medfee_sumamt) * 100).toFixed(2) + "%" }}</td>
         <td width="10%">10%缺口资金</td>
-        <td width="10%">{{ }}</td>
+        <td width="10%"></td>
         <td width="10%">实付金额</td>
-        <td width="10%">{{ }}</td>
+        <td width="10%">{{info.psn_cash_pay}}</td>
       </tr>
     </table>
     <!-- <div style="margin: 10px 0;">医疗机构名称:
@@ -188,7 +188,7 @@
         <span v-if="info.insutype == '510'">生育保险</span>
       </div>
     </div>
-  
+
     <table class="statementTable" border="1" style="text-align: left;">
       <tr>
         <td>患者姓名:{{info.patient.name}}</td>
@@ -293,7 +293,7 @@
       <div style="flex: 1;">结算人:{{  }} </div>
       <div style="flex: 1;">打印日期:{{getNowTime()}}</div>
       <div style="flex: 1;">参保人签字:</div>
-    </div> 
+    </div>
   </div>
 </template>
 <script>

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -9,7 +9,9 @@
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10694">江西省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10489">湖北省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10731">医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10635 || this.$store.getters.xt_user.org_id == 0">江西省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10635 ">江西省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10387 || this.$store.getters.xt_user.org_id == 0">湖南省社会医疗保险医疗费用结算单</div>
+
 
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10489 && this.$store.getters.xt_user.org_id != 10515 &&
                   this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 &&

src/xt_pages/outpatientCharges/summary.vue

@@ -63,6 +63,11 @@
             size="small" type="primary" @click="batch_print_settlte">批量打印结算单
           </el-button>
           <el-button size="small" type="primary" @click="list_click">批量打印费用清单</el-button>
+
+          <el-button
+            v-if="$store.getters.xt_user.org_id == 10644"
+            size="small" type="primary" @click="batch_print_settle_10644">批量打印结算单
+          </el-button>
           <el-button size="small" type="primary" @click="export_detail"
           >报表下载
           </el-button>
@@ -72,7 +77,7 @@
           <el-button v-if="$store.getters.xt_user.org_id == 10318" size="small"
                      type="primary" @click="export_detail_ten_two">报表下载3
           </el-button>
-          
+
         </div>
       </div>
 
@@ -501,6 +506,22 @@
       ></settlement-print>
     </el-dialog>
 
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="batchStatementVisible_two"
+    >
+<!--      <hospital-batch-statement-print-->
+<!--        ref="hospital_batch_print" :paramsObj="batchParams"-->
+<!--      >-->
+<!--      </hospital-batch-statement-print>-->
+      <hospital-batch-statement-print
+        ref="hospital_batch_print" :paramsObj="batchParams"
+      >
+      </hospital-batch-statement-print>
+    </el-dialog>
+
     <el-dialog
       class="centerDialog"
       width="1200px"
@@ -667,11 +688,13 @@ import StatementListPrint from './statementListPrint'
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
 import BatchStatementPrint from './batchStatementPrint'
 import { exportMdtrtCertType } from '../../api/his/his_tools'
+import HospitalBatchStatementPrint from "../hospitalStation/hospitalBatchStatementPrint.vue";
 
 const moment = require('moment')
 export default {
   name: 'OutpatientChargesSummary',
   components: {
+    HospitalBatchStatementPrint,
     BatchStatementPrint,
     StatementListPrint,
     NewStatementPrintTwo,
@@ -684,6 +707,7 @@ export default {
   },
   data() {
     return {
+      batchParams:{},
       staff:"",
       admins:[],
       orderObj: {},
@@ -700,6 +724,7 @@ export default {
       statementListVisible: false,
       statementVisible: false,
       batchStatementVisible: false,
+      batchStatementVisible_two:false,
       statementVisible9504: false,
       orderObj9504: {},
       crumbs: [
@@ -3328,6 +3353,23 @@ export default {
         }
       }
       return res
+    },batch_print_settle_10644(){
+      if (this.selecting_schs.length === 0) {
+        this.$message.error('请至少选择一条需要打印的内容')
+        return false
+      } else {
+        var sch_ids = []
+        for (let index = 0; index < this.selecting_schs.length; index++) {
+          sch_ids.push(this.selecting_schs[index].id)
+        }
+        this.batchStatementVisible_two = true;
+        let params = {
+          order_ids: sch_ids.join(","),
+          admin_user_id: this.$store.getters.xt_user.user.id,
+        };
+        this.batchParams = params
+
+      }
     },
     batch_print_settlte() {
       if (this.selecting_schs.length === 0) {
@@ -3468,6 +3510,7 @@ export default {
             // console.log(order.setl_detail)
             // if (order.setl_detail && order.setl_detail.length > 0) {
             //   var jsonObj = JSON.parse(order.setl_detail)
+            //   var jsonObj = JSON.parse(order.setl_detail)
             //   if (jsonObj != null) {
             //     for (let i = 0; i < jsonObj.length; i++) {
             //       if (order.insutype == '310') {
@@ -4215,7 +4258,7 @@ export default {
       this.$router.push({path:'/listTemplate/batch_listPrint',query:{list_id:list_id}})
       // list_batch(list_id).then(res =>{
       //   console.log('res',res);
-        
+
       // })
     }
   },

src/xt_pages/outpatientTool/components/personSettle.vue

@@ -0,0 +1,502 @@
+<template>
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div>
+
+        <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-option
+            label="全部"
+            value="0">
+          </el-option>
+          <el-option
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+        <el-date-picker
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期">
+        </el-date-picker>
+        <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+        <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+      </div>
+      <div>
+        <!-- <el-popover
+          placement="bottom"
+          width="210"
+          trigger="click">
+          <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+          <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+          <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+        </el-popover> -->
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+      </div>
+    </div>
+    <el-table ref="tables" :data="tableData" border :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              v-loading="settle_loading"
+              max-height="600"
+              highlight-current-row>
+
+      <el-table-column align="center" prop="name" label="患者名字" fixed>
+        <template slot-scope="scope">{{ scope.row.name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="id_card_no" label="身份证">
+        <template slot-scope="scope">
+          {{scope.row.id_card_no}}
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="dis"   label="透析次数">
+        <template slot-scope="scope">
+          {{scope.row.dis.length}}
+
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="s_count"  label="结算次数">
+        <template slot-scope="scope">
+          {{scope.row.orders.length}}
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">
+        <template slot-scope="scope">{{GetMedfeeSumam(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="fund_pay_sumamt" label="基金支付金额">
+        <template slot-scope="scope">{{GetFundPaySumamt(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="acct_pay" label="个人账户支付金额">
+        <template slot-scope="scope">{{GetAcctPay(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="psn_cash_pay" label="个人支付金额">
+        <template slot-scope="scope">{{GetPsnCashPay(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="hifp_pay" label="基金统筹金额">
+        <template slot-scope="scope">{{GetHifpPay(scope.row)}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="hifob_pay" label="大额基金支付">
+        <template slot-scope="scope">{{GetHiFobPay(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="preselfpay_amt" label="先行自付金额">
+        <template slot-scope="scope">{{GetPreselfpaAmt(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="overlmt_self_pay" label="超限价金额">
+        <template slot-scope="scope">{{GetOverlmtSelfPay(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="fulamt_ownpay_amt" label="全自费金额">
+        <template slot-scope="scope">{{GetFulamtOwnpayAmt(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="inscp_scp_amt" label="符合政策范围金额">
+        <template slot-scope="scope">{{GetInscpScpAmt(scope.row)}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="maf_pay" label="医疗救助基金">
+        <template slot-scope="scope">{{GetMafPay(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="hifes_pay" label="企业补充医疗保险基金支出">
+        <template slot-scope="scope">{{GetHifesPay(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="hifmi_pay" label="居民大病保险资金支出">
+        <template slot-scope="scope">{{GetHifmiPay(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="oth_pay" label="其他支付">
+        <template slot-scope="scope">{{GetOthPay(scope.row)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="cvlserv_pay" label="公务员医疗补助资金支出">
+        <template slot-scope="scope">{{GetCvlservPay(scope.row)}}</template>
+      </el-table-column>
+
+
+    </el-table>
+
+  </div>
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetSummarySettle,changeOrderDesc } from '@/api/his/his'
+import { uParseTime } from '@/utils/tools'
+// import NewStatementPrint from './newStatementPrint'
+const moment = require('moment')
+export default {
+  components: {
+    BreadCrumb
+
+  },
+  data() {
+    return {
+      settle_loading:false,
+      crumbs: [],
+      tempArr: [],
+      sameRowArr: [],
+      modeOptions:this.$store.getters.treatment_mode,
+      tableData: [],
+      config:{},
+      sick:{},
+      chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+      item_type: '0',
+      items: [
+        { id: 2, name: '自费' },
+        { id: 5, name: '城乡居民基本医疗保险' },
+        { id: 6, name: '职工基本医疗保险' }
+      ]
+
+    }
+  },
+  methods: {
+    GetMedfeeSumam(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].medfee_sumamt
+      }
+      return medfee.toFixed(2)
+
+    }, GetFundPaySumamt(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].fund_pay_sumamt
+      }
+      return medfee.toFixed(2)
+
+    },GetAcctPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].acct_pay
+      }
+      return medfee.toFixed(2)
+
+    },GetPsnCashPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].psn_cash_pay
+      }
+      return medfee.toFixed(2)
+
+    },GetHifpPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].hifp_pay
+      }
+      return medfee.toFixed(2)
+
+    },GetHiFobPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].hifob_pay
+      }
+      return medfee.toFixed(2)
+
+    },GetPreselfpaAmt(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].preselfpay_amt
+      }
+      return medfee.toFixed(2)
+
+    },GetOverlmtSelfPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].overlmt_self_pay
+      }
+      return medfee.toFixed(2)
+    },GetFulamtOwnpayAmt(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].fulamt_ownpay_amt
+      }
+      return medfee.toFixed(2)
+
+    },GetMafPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].maf_pay
+      }
+      return medfee.toFixed(2)
+
+    },GetHifesPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].hifes_pay
+      }
+      return medfee.toFixed(2)
+
+    },GetHifmiPay(row){
+
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].hifmi_pay
+      }
+      return medfee.toFixed(2)
+    },GetInscpScpAmt(row){
+
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].inscp_scp_amt
+      }
+      return medfee.toFixed(2)
+
+    },GetOthPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].oth_pay
+      }
+      return medfee.toFixed(2)
+
+    },GetCvlservPay(row){
+      let medfee = 0
+      for(let i = 0; i < row.orders.length; i++){
+        medfee = medfee + row.orders[i].cvlserv_pay
+      }
+      return medfee.toFixed(2)
+    },
+    change(id,desc,type){
+      let params = {
+        id: id,
+        desc: desc,
+        change_type: type
+      }
+      changeOrderDesc(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+        } else {
+          this.$message.success(response.data.data.msg)
+        }
+      })
+    },
+    getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+    unique(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+    },getSickName(sick_id){
+      let name = ""
+      for(let i = 0;i < this.sick.length;i++){
+        if(sick_id == this.sick[i].id){
+          name = this.sick[i].class_name + "(" + this.sick[i].content_code +")"
+        }
+      }
+      return name
+    },getTypeName(row){
+      let name = ""
+      if(row.insutype == '390'){
+        // let a =  config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+        let a =  this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+
+
+        // let aa=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
+        let b=  row.his.insuplc_admdvs.slice(0, 3); //参保地前3位编码
+        if(a == b){
+          name = "本地城乡"
+        }else{
+          name = "异地城乡"
+        }
+
+      }else if(row.insutype == '310'){
+        // let c =  config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+        let a = this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+
+
+        // let d=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
+        let b=  row.his.insuplc_admdvs.slice(0, 3); //参保地前3位编码
+        if(a == b){
+
+          name = "本地职工"
+        }else{
+          name = "异地职工"
+        }
+
+      }else{
+        name = "其他"
+
+      }
+      return name
+    },getName(id){
+      var name = ""
+      var options =  this.$store.getters.insuplc_admdvs
+      for(let i = 0; i < options.length; i++){
+        if(id == options[i].value){
+          name = options[i].label
+        }
+      }
+      return name
+    },
+    changeDate() {
+      this.getSummarySettleList()
+    },
+    changeItem() {
+      this.getSummarySettleList()
+
+    },
+    searchAction() {
+      this.item_type = '0'
+      this.getSummarySettleList()
+
+    },
+    getSummarySettleList() {
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+        type: this.item_type,
+        keyword: this.keywords,
+        s_type:2,
+      }
+      this.settle_loading = true
+      GetSummarySettle(params).then(response => {
+        if (response.data.state == 0) {
+          this.settle_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.settle_loading = false
+          this.tableData = []
+          this.config = response.data.data.config
+          this.sick = response.data.data.sick
+          let data = response.data.data.patients
+          this.tableData = data
+          console.log( this.tableData)
+
+        }
+      })
+    }, uniqueProjectAndAdvice(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    }, sort(arr) {
+      for (var i = 0; i < arr.length - 1; i++) {
+        for (var j = 0; j < arr.length - i - 1; j++) {
+          if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
+            var hand = arr[j]
+            arr[j] = arr[j + 1]
+            arr[j + 1] = hand
+
+          }
+        }
+      }
+      return arr
+    }, handleSpanTempArr() {
+      this.tempArr = []
+
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (i === 0) {
+          this.tempArr.push(1)
+          this.pos = 0
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
+            this.tempArr[this.pos] += 1
+            this.tempArr.push(0)
+          } else {
+            this.tempArr.push(1)
+            this.pos = i
+          }
+        }
+      }
+
+      let sameRowArr = [], sIdx = 0
+      this.tableData.forEach((item, index) => {
+        item.index = index
+        if (index === 0) {
+          sameRowArr.push([index])
+        } else {
+          if (item.patient_id === this.tableData[index - 1].patient_id) {
+            sameRowArr[sIdx].push(index)
+          } else {
+            sIdx = sIdx + 1
+            sameRowArr.push([index])
+          }
+        }
+      })
+      this.sameRowArr = sameRowArr
+    }, merge({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        const _row = this.tempArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
+  export_detail() {
+
+      let list = []
+      for (let i = 0; i < this.tableData.length; i++) {
+        let order = this.tableData[i]
+        let name = order.name
+
+        let obj = {
+          '患者姓名': name,
+        }
+        list.push(obj)
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = [ '患者姓名']
+        const filterVal = [ '患者姓名']
+        const data = this.formatJson(filterVal, list)
+        excel.export_json_to_excel1({
+          header: tHeader,
+          data,
+          filename: '汇总',
+          ref:this.$refs['tables'].$el
+        })
+      })
+
+    }, formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    }
+  },
+  created() {
+    this.getSummarySettleList()
+
+
+  }
+}
+</script>

src/xt_pages/outpatientTool/components/print9919.vue

@@ -2,7 +2,7 @@
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org.id != 10480 && this.$store.getters.xt_user.org.id != 10387">广东省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org.id == 10387">湖南省社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-else>安徽省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org.id == 10480">安徽省社会医疗保险医疗费用结算单</div>
     <table class="statementTable" border="1" style="border-collapse: collapse;">
       <tr>
         <td width="80">机构名称</td>
@@ -121,14 +121,18 @@
         <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
         <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
 
-        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217">入院第一诊断</td>
+        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10387">入院第一诊断</td>
         <td v-else>病种名称</td>
-        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217" colspan="3">{{info.dise_name}}</td>
-        <td v-else colspan="3">{{'慢性肾功能衰竭'}}</td>
-        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217">出院第一诊断</td>
+        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10387" colspan="3">{{info.dise_name}}</td>
+        <td v-else-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217" colspan="3">{{'慢性肾功能衰竭'}}</td>
+        <td v-else-if="this.$store.getters.xt_user.org_id == 10387" colspan="3">{{'慢性肾功能衰竭'}}</td>
+
+        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10387">出院第一诊断</td>
         <td v-else>病种编码</td>
-        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217" colspan="6">{{info.dise_name}}</td>
-        <td v-else colspan="6">{{'M07800'}}</td>
+        <td v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10387" colspan="6">{{info.dise_name}}</td>
+        <td v-else-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217" colspan="6">{{'M07800'}}</td>
+        <td v-else-if="this.$store.getters.xt_user.org_id == 10387" colspan="6">{{'M07801'}}</td>
+
       </tr>
       <tr>
         <td>业务类别</td>

src/xt_pages/outpatientTool/components/settle.vue

@@ -46,16 +46,16 @@
                 <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
               </el-popover> -->
-              <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+              <el-button size="small" type="primary" @click="dialogVisible = true">报表下载</el-button>
           </div>
       </div>
       <el-table :data="tableData" border :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                show-summary
+
                 v-loading="settle_loading"
                 max-height="600"
                 :span-method="merge"
-                :summary-method="getTotal"
+
                 highlight-current-row>
 
           <el-table-column align="center" prop="name" label="患者名字" fixed>
@@ -121,7 +121,16 @@
                   <div v-if="scope.row.med_type == '992102'">单病种(992102)</div>
               </template>
           </el-table-column>
-          <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">
+
+
+<!--        <el-table-column align="center" prop="item_name" label="透析模式">-->
+<!--          <template slot-scope="scope">-->
+<!--            <div v-if="scope.row.sch.id == 0">未排版</div>-->
+<!--            <div v-if="scope.row.sch.id > 0">{{modeOptions[scope.row.sch.mode_id].name}}</div>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+        <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">
               <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="fund_pay_sumamt" label="基金支付金额">
@@ -257,193 +266,36 @@
 
       </el-table>
 
-    <el-table ref="report-table" :data="tableData" v-show="false" border :row-style="{ color: '#303133' }"
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-              show-summary
-              v-loading="settle_loading"
-              max-height="600"
-              :span-method="merge"
-              :summary-method="getTotal"
-              highlight-current-row>
-
-      <el-table-column align="center" prop="name" label="患者名字">
-        <template slot-scope="scope">{{ scope.row.other_name }}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="身份证">
-        <template slot-scope="scope">
-          {{scope.row.id_card_no}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="就诊号">
-        <template slot-scope="scope">
-          {{scope.row.mdtrt_id}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="治疗日期">
-        <template slot-scope="scope">
-          {{getTimes(scope.row.settle_accounts_date)}}
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="item_name" label="结算日期">
-        <template slot-scope="scope">
-          {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="病种名称">
-        <template slot-scope="scope">
-          {{getSickName(scope.row.his.sick_type)}}
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="item_name" label="参保地">
-        <template slot-scope="scope">
-          {{getName(scope.row.his.insuplc_admdvs) + '(' + scope.row.his.insuplc_admdvs +')'}}
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="item_name" label="结算类型">
-        <template slot-scope="scope">
-          <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
-          <div v-if="scope.row.is_medicine_insurance == 1 ">{{getTypeName(scope.row)}}</div>
-
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="处方类型">
-        <template slot-scope="scope">
-          <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
-          <div v-if="scope.row.med_type == '11'">普通门诊</div>
-          <div v-if="scope.row.med_type == '1112'">普通门诊</div>
-          <div v-if="scope.row.med_type == '140104'">门诊特殊病(140104)</div>
-          <div v-if="scope.row.med_type == '140201'">门诊特病(140201)</div>
-          <div v-if="scope.row.med_type == '992102'">单病种(992102)</div>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">
-        <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="fund_pay_sumamt" label="基金支付金额">
-        <template slot-scope="scope">{{scope.row.fund_pay_sumamt.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="acct_pay" label="个人账户支付金额">
-        <template slot-scope="scope">{{scope.row.acct_pay.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="psn_cash_pay" label="个人支付金额">
-        <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="hifp_pay" label="基金统筹金额">
-        <template slot-scope="scope">{{scope.row.hifp_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="hifob_pay" label="大额基金支付">
-        <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="preselfpay_amt" label="先行自付金额">
-        <template slot-scope="scope">{{scope.row.preselfpay_amt.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="overlmt_self_pay" label="超限价金额">
-        <template slot-scope="scope">{{scope.row.overlmt_self_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="fulamt_ownpay_amt" label="全自费金额">
-        <template slot-scope="scope">{{scope.row.fulamt_ownpay_amt.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="inscp_scp_amt" label="符合政策范围金额">
-        <template slot-scope="scope">{{scope.row.inscp_scp_amt.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="maf_pay" label="医疗救助基金">
-        <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="hifes_pay" label="企业补充医疗保险基金支出">
-        <template slot-scope="scope">{{scope.row.hifes_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-
-      <el-table-column align="center" prop="hifmi_pay" label="居民大病保险资金支出">
-        <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="oth_pay" label="其他支付">
-        <template slot-scope="scope">{{scope.row.oth_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="cvlserv_pay" label="公务员医疗补助资金支出">
-        <template slot-scope="scope">{{scope.row.cvlserv_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-
-
-      <el-table-column align="center" prop="wechat_pay" label="发票号码">
-        <template slot-scope="scope">{{scope.row.fa_piao_number}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="wechat_pay" label="发票编号">
-        <template slot-scope="scope">{{scope.row.fa_piao_code}}</template>
-      </el-table-column>
-
-
-      <el-table-column align="center" prop="wechat_pay" label="微信支付">
-        <template slot-scope="scope">{{scope.row.wechat_pay}}</template>
-
-<!--        <template slot-scope="scope" style="width: 100px">-->
-<!--          <el-input v-model="scope.row.wechat_pay" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>-->
-<!--        </template>-->
-      </el-table-column>
-
-      <el-table-column align="center" prop="ali_pay" label="支付宝支付">
-                  <template slot-scope="scope">{{scope.row.ali_pay}}</template>
-<!--        <template slot-scope="scope" style="width: 100px">-->
-<!--          <el-input  v-model="scope.row.ali_pay" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>-->
-<!--        </template>-->
-      </el-table-column>
-
-      <el-table-column align="center" prop="band_card_pay" label="银行卡支付">
-                  <template slot-scope="scope">{{scope.row.band_card_pay}}</template>
-<!--        <template slot-scope="scope" style="width: 100px">-->
-<!--          <el-input v-model="scope.row.band_card_pay" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>-->
-<!--        </template>-->
-      </el-table-column>
-
-      <el-table-column align="center" prop="jifen_pay" label="积分支付">
-                  <template slot-scope="scope">{{scope.row.jifen_pay}}</template>
-<!--        <template slot-scope="scope" style="width: 100px">-->
-<!--          <el-input v-model="scope.row.jifen_pay" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>-->
-<!--        </template>-->
-      </el-table-column>
-
-      <el-table-column align="center" prop="cash_pay" label="现金支付">
-                  <template slot-scope="scope">{{scope.row.cash_pay}}</template>
-<!--        <template slot-scope="scope" style="width: 100px">-->
-<!--          <el-input v-model="scope.row.cash_pay" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>-->
-<!--        </template>-->
-      </el-table-column>
-
-
-      <el-table-column align="center" prop="card_desc" label="储值卡说明">
-        <template slot-scope="scope">{{scope.row.card_desc}}</template>
-        <!--        <template slot-scope="scope" style="width: 100px">-->
-        <!--          <el-input v-model="scope.row.oth_desc"></el-input>-->
-        <!--        </template>-->
-      </el-table-column>
-
-      <el-table-column align="center" prop="item_name" label="其他说明">
-                  <template slot-scope="scope">{{scope.row.oth_desc}}</template>
-<!--        <template slot-scope="scope" style="width: 100px">-->
-<!--          <el-input v-model="scope.row.oth_desc"></el-input>-->
-<!--        </template>-->
-      </el-table-column>
-
-      <el-table-column align="center" prop="total" label="费用总额">
-        <template slot-scope="scope">
-          <div>{{scope.row.total.toFixed(2)}}</div>
-        </template>
-      </el-table-column>
 
-    </el-table>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <span>选择下载时间段</span>
+
+      <el-date-picker
+        v-model="chargeDate"
+        type="daterange"
+        value-format="yyyy-MM-dd"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期">
+      </el-date-picker>
+
+      <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="export_detail">确 定</el-button>
+             </span>
+    </el-dialog>
+
+    <el-pagination
+      @size-change="handleSizeChangeOne"
+      @current-change="handleCurrentChangeOne"
+      background
+      style="margin-top:20px;float: right"
+      :total="total"
+    ></el-pagination>
 
   </div>
 </template>
@@ -462,20 +314,25 @@ import { uParseTime } from '@/utils/tools'
     },
     data() {
       return {
+        total:0,
+        limit:10,
+        page:1,
         settle_loading:false,
         crumbs: [],
         tempArr: [],
         sameRowArr: [],
+        dialogVisible:false,
+        modeOptions:this.$store.getters.treatment_mode,
         tableData: [],
+        tableData_three: [],
         config:{},
         sick:{},
+        chargeDate_two:[moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
         chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
         item_type: '0',
         items: [
           { id: 1, name: '医保' },
           { id: 2, name: '自费' },
-          { id: 3, name: '门诊特殊病' },
-          { id: 4, name: '普通门诊' },
           { id: 5, name: '城乡居民基本医疗保险' },
           { id: 6, name: '职工基本医疗保险' }
 
@@ -485,6 +342,18 @@ import { uParseTime } from '@/utils/tools'
       }
     },
     methods: {
+      handleSizeChangeOne(val) {
+        this.limit = val
+        this.GetRemindPatientList();
+      },
+      handleCurrentChangeOne(val) {
+        this.page = val;
+        this.GetRemindPatientList();
+      },
+      getMode(id){
+
+
+      },
       change(id,desc,type){
         let params = {
           id: id,
@@ -591,7 +460,10 @@ import { uParseTime } from '@/utils/tools'
           start_time: start_time,
           end_time: end_time,
           type: this.item_type,
-          keyword: this.keywords
+          keyword: this.keywords,
+          limit:this.limit,
+          page:this.page,
+          s_type: 1,
         }
         this.settle_loading = true
         GetSummarySettle(params).then(response => {
@@ -603,9 +475,9 @@ import { uParseTime } from '@/utils/tools'
           } else {
             this.settle_loading = false
             this.tableData = []
+            this.total = response.data.data.total
             this.config = response.data.data.config
             this.sick = response.data.data.sick
-
             let data = response.data.data.patients
 
             for (let i = 0; i < data.length; i++) {
@@ -747,103 +619,263 @@ import { uParseTime } from '@/utils/tools'
         return sums
       },
       export_detail() {
+        // this.getSummarySettleList()
+        let start_time = this.chargeDate[0]
+        let end_time = this.chargeDate[1]
+        let params = {
+          start_time: start_time,
+          end_time: end_time,
+          type: this.item_type,
+          keyword: this.keywords,
+          s_type:2,
+        }
+
+        GetSummarySettle(params).then(response => {
+          if (response.data.state == 0) {
+
+
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.settle_loading = false
+            this.tableData_three = []
+            this.config = response.data.data.config
+            this.sick = response.data.data.sick
 
-        let list = []
-        // for (let i = 0; i < this.tableData.length; i++) {
-        //   let order = this.tableData[i]
-        //   let name = order.other_name
-        //   let id_card_no = order.id_card_no
-        //
-        //   let time = ''
-        //   let balance_accounts = ""
-        //   let med_type = ""
-        //   let medfee_sumamt = ""
-        //   let fund_pay_sumamt = ""
-        //   let acct_pay = ""
-        //   let psn_cash_pay = ""
-        //   let hifes_pay = ""
-        //   let hifmi_pay = ""
-        //   let hifp_pay = ""
-        //   let hifob_pay = ""
-        //   let maf_pay = ""
-        //   let time2 = ""
-        //   time2 = this.getTimes(order.settle_accounts_date)
-        //
-        //   let total = ""
-        //
-        //   if(order.setl_time.length == 0){
-        //
-        //     time = this.getTimes(order.settle_accounts_date)
-        //
-        //   }else {
-        //
-        //     time = order.setl_time.split(" ")[0]
-        //
-        //   }
-        //
-        //   if (order.is_medicine_insurance == 0) {
-        //     balance_accounts = '自费'
-        //   }
-        //
-        //   if (order.is_medicine_insurance == 1) {
-        //     balance_accounts = '医保'
-        //   }
-        //
-        //   if (order.med_type == '14') {
-        //     med_type = '门诊特殊病'
-        //   }
-        //
-        //   if (order.med_type == '11') {
-        //     med_type = '普通门诊'
-        //   }
-        //
-        //   medfee_sumamt = order.medfee_sumamt
-        //   fund_pay_sumamt = order.fund_pay_sumamt
-        //
-        //   acct_pay = order.acct_pay
-        //
-        //   psn_cash_pay = order.psn_cash_pay
-        //   hifes_pay = order.hifes_pay
-        //   hifmi_pay = order.hifmi_pay
-        //   hifp_pay = order.hifp_pay
-        //   hifob_pay = order.hifob_pay
-        //   maf_pay = order.maf_pay
-        //   total = order.total
-        //
-        //
-        //   let obj = {
-        //     '患者姓名': name,
-        //     '身份证': id_card_no,
-        //     '治疗日期': time2,
-        //     '结算日期': time,
-        //     '结算类型': balance_accounts,
-        //     '处方类型': med_type,
-        //     '医疗费总额': medfee_sumamt,
-        //     '基金支付金额': fund_pay_sumamt,
-        //     '基金统筹金额': hifp_pay,
-        //     '大额基金支付':hifob_pay,
-        //     '医疗救助基金':maf_pay,
-        //     '个人账户支付金额': acct_pay,
-        //     '个人支付基金': psn_cash_pay,
-        //     '企业补充医疗保险基金支出': hifes_pay,
-        //     '居民大病保险资金支出': hifmi_pay,
-        //     '费用总额':total,
-        //
-        //   }
-        //   list.push(obj)
-        // }
-        import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = [ '患者姓名','身份证', '治疗日期','结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出', '费用总额']
-          const filterVal = [ '患者姓名','身份证', '治疗日期','结算日期', '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付基金','企业补充医疗保险基金支出','居民大病保险资金支出',  '费用总额']
-          const data = this.formatJson(filterVal, list)
-          excel.export_json_to_excel1({
-            header: tHeader,
-            data,
-            filename: '结算明细',
-            ref:this.$refs['report-table'].$el
-          })
+            let data = response.data.data.patients
+
+            for (let i = 0; i < data.length; i++) {
+              let total = 0
+              for (let b = 0; b < data[i].orders.length; b++) {
+                let order = data[i].orders[b]
+                order['other_name'] = data[i].name
+                order['id'] = order.id
+                order['id_card_no'] = data[i].id_card_no
+                order['mdtrt_id'] =order.mdtrt_id
+                total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(2).toString())
+              }
+              data[i]['total'] = total
+            }
+
+            for (let i = 0; i < data.length; i++) {
+              for (let b = 0; b < data[i].orders.length; b++) {
+                let order = data[i].orders[b]
+
+                if(b == 0){
+                  order['total'] = data[i].total
+
+                }else{
+                  order['total'] = 0
+
+                }
+                this.tableData_three.push(order)
+              }
+            }
+
+            let list = []
+            for (let i = 0; i < this.tableData_three.length; i++) {
+              let order = this.tableData_three[i]
+              let name = order.other_name
+              let id_card_no = order.id_card_no
+              let m_id = order.mdtrt_id
+              let setl_date = order.setl_time.split(" ")[0]
+              let setl_time = order.setl_time
+              let sick_name =this.getSickName(order.his.sick_type)
+              let cbd = this.getName(order.his.insuplc_admdvs) + "(" + order.his.insuplc_admdvs + ")"
+              let settle_type = ""
+              if(order.is_medicine_insurance == 0){
+                settle_type = "自费"
+              }else{
+                settle_type = this.getTypeName(order)
+              }
+
+              let med_name = ""
+              switch (order.med_type){
+                case "14":
+                  med_name = "门诊特殊病"
+                  break
+                case "11":
+                  med_name = "普通门诊"
+
+                  break
+                case "1112":
+                  med_name = "普通门诊"
+
+                  break
+                case "140104":
+                  med_name = "城乡门诊特殊病(140104)"
+
+                  break
+                case "140201":
+                  med_name = "门诊特病(140201)"
+
+                  break
+                case "992102":
+                  med_name = "单病种(992102)"
+                  break
+              }
+
+              let mode_name = ""
+              if(order.sch.id == 0){
+                mode_name = "未排班"
+              }else{
+                mode_name = this.modeOptions[order.sch.mode_id].name
+              }
+
+
+
+              let balance_accounts = ""
+              let med_type = ""
+              let medfee_sumamt = ""
+              let fund_pay_sumamt = ""
+              let acct_pay = ""
+              let psn_cash_pay = ""
+              let hifes_pay = ""
+              let hifmi_pay = ""
+              let hifp_pay = ""
+              let hifob_pay = ""
+              let maf_pay = ""
+              let time2 = ""
+              time2 = this.getTimes(order.settle_accounts_date)
+
+
+              medfee_sumamt = order.medfee_sumamt
+              fund_pay_sumamt = order.fund_pay_sumamt
+              acct_pay = order.acct_pay
+              psn_cash_pay = order.psn_cash_pay
+
+              console.log( order.psn_cash_pay)
+
+              console.log(psn_cash_pay)
+
+              hifp_pay = order.hifp_pay
+              hifob_pay = order.hifob_pay
+
+              let preselfpay_amt;
+              preselfpay_amt = order.preselfpay_amt
+
+
+              let overlmt_self_pay;
+              overlmt_self_pay = order.overlmt_self_pay
+
+              let fulamt_ownpay_amt;
+              fulamt_ownpay_amt = order.fulamt_ownpay_amt
+
+
+              let inscp_scp_amt;
+              inscp_scp_amt = order.inscp_scp_amt
+
+
+
+              maf_pay = order.maf_pay
+
+
+              hifes_pay = order.hifes_pay
+              hifmi_pay = order.hifmi_pay
+
+
+              let oth_pay;
+              oth_pay = order.oth_pay
+
+
+              let cvlserv_pay;
+              cvlserv_pay = order.cvlserv_pay
+
+
+
+              let fa_piao_code;
+              fa_piao_code = order.fa_piao_code
+
+
+              let fa_piao_number;
+              fa_piao_number = order.fa_piao_number
+
+              let ali_pay;
+              ali_pay = order.ali_pay
+
+
+              let band_card_pay;
+              band_card_pay = order.band_card_pay
+
+
+              let jifen_pay;
+              jifen_pay = order.jifen_pay
+
+              let wechat_pay;
+              wechat_pay = order.wechat_pay
+
+
+              let cash_pay;
+              cash_pay = order.cash_pay
+
+
+              let card_desc;
+              card_desc = order.card_desc
+
+
+              let oth_desc;
+              oth_desc = order.oth_desc
+
+
+              let obj = {
+                '患者姓名': name,
+                '身份证': id_card_no,
+                "就诊号": m_id,
+                '治疗日期': time2,
+                "结算日期": setl_date,
+                '结算时间': setl_time,
+                "病种名称":sick_name,
+                "参保地":cbd,
+                '结算类型': settle_type,
+                '处方类型':  med_name,
+                // "透析模式": mode_name,
+                '医疗费总额': medfee_sumamt,
+                '基金支付金额': fund_pay_sumamt,
+                '个人账户支付金额': acct_pay,
+                '个人支付金额': psn_cash_pay,
+                '基金统筹金额': hifp_pay,
+                '大额基金支付':hifob_pay,
+                '先行自付金额': preselfpay_amt,
+                '超限价金额': overlmt_self_pay,
+                '全自费金额': fulamt_ownpay_amt,
+                '符合政策范围金额': inscp_scp_amt,
+                '医疗救助基金':maf_pay,
+                '企业补充医疗保险基金支出': hifes_pay,
+                '居民大病保险资金支出': hifmi_pay,
+                '其他支付': oth_pay,
+                '公务员医疗补助资金支出': cvlserv_pay,
+                '发票号码': fa_piao_number,
+                '发票编号': fa_piao_code,
+                '微信支付': wechat_pay,
+                '支付宝支付': ali_pay,
+                '银行卡支付': band_card_pay,
+                '积分支付': jifen_pay,
+                '现金支付': cash_pay,
+                '储值卡说明': card_desc,
+                '其他说明': oth_desc,
+              }
+              list.push(obj)
+            }
+
+            if(list.length > 0){
+              import('@/vendor/Export2Excel').then(excel => {
+                const tHeader = ['患者姓名', '身份证', "就诊号", '治疗日期', '结算日期', "结算时间", "病种名称", "参保地", '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付金额', "基金统筹金额", "大额基金支付", "先行自付金额", "超限价金额", "全自费金额", "符合政策范围金额", "医疗救助基金", '企业补充医疗保险基金支出', '居民大病保险资金支出', "其他支付", "公务员医疗补助资金支出", "发票号码", "发票编号", "微信支付", "支付宝支付", "银行卡支付", "积分支付", "现金支付", "储值卡说明", '其他说明']
+                const filterVal = ['患者姓名', '身份证', "就诊号", '治疗日期', '结算日期', "结算时间", "病种名称", "参保地", '结算类型', '处方类型', '医疗费总额', '基金支付金额', '个人账户支付金额', '个人支付金额', "基金统筹金额", "大额基金支付", "先行自付金额", "超限价金额", "全自费金额", "符合政策范围金额", "医疗救助基金", '企业补充医疗保险基金支出', '居民大病保险资金支出', "其他支付", "公务员医疗补助资金支出", "发票号码", "发票编号", "微信支付", "支付宝支付", "银行卡支付", "积分支付", "现金支付", "储值卡说明", '其他说明']
+
+                const data = this.formatJson(filterVal, list)
+                excel.export_json_to_excel({
+                  header: tHeader,
+                  data,
+                  filename: '结算明细'
+                })
+              })
+            }
+
+          }
         })
 
+
+
       }, formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       }

src/xt_pages/outpatientTool/summary.vue

@@ -10,12 +10,15 @@
                     <el-tab-pane label="明细" name="明细"></el-tab-pane>
                     <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
                     <el-tab-pane label="结算" name="结算"></el-tab-pane>
+                  <el-tab-pane label="个人汇总结算" name="个人汇总结算"></el-tab-pane>
+
                   <el-tab-pane label="全部汇总" name="全部汇总"></el-tab-pane>
 
                 </el-tabs>
                 <detail v-if="titleType == '明细'"></detail>
                 <gather v-if="titleType == '汇总'"></gather>
                 <settle v-if="titleType == '结算'"></settle>
+              <person-settle v-if="titleType == '个人汇总结算'"></person-settle>
 <!--              <allgather v-if="titleType == '全部汇总'"></allgather>-->
               <allgather v-if="titleType == '全部汇总'"></allgather>
 
@@ -34,12 +37,14 @@
   import Gather from './components/gather'
   import Detail from './components/detail'
   import Allgather from './components/allgather.vue'
+  import PersonSettle from "./components/personSettle.vue";
 
 
   const moment = require('moment')
 
   export default {
     components: {
+      PersonSettle,
       Allgather,
       Gather,
       Settle,

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -37,10 +37,10 @@
                         <td align="center">{{item.max_unit}}</td>
                         <td align="center">
                           <span v-if="item.stock_max_number>0">
-                            {{ item.stock_max_number }}{{ item.max_unit }}
+                            {{ item.stock_max_number }}{{ item.max_unit_one }}
                           </span>
                            <span v-if="item.stock_min_number>0">
-                            {{ item.stock_min_number }}{{ item.min_unit }}
+                            {{ item.stock_min_number }}{{ item.min_unit_one }}
                            </span>
                         </td>
                         <td align="center">