From 43e075ad7d5348968bed9943feee7083776bdcca Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Tue, 9 Feb 2021 09:54:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E4=BB=98=E8=B4=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtPrepaymentDaoController.java | 20 +++++--- .../fantang/domain/FtPrepaymentDao.java | 4 +- .../fantang/mapper/FtPrepaymentDaoMapper.java | 12 ++--- .../service/IFtPrepaymentDaoService.java | 7 +-- .../impl/FtPrepaymentDaoServiceImpl.java | 14 +++--- .../mapper/fantang/FtPrepaymentDaoMapper.xml | 28 +++++++++++ .../src/views/fantang/prepayment/index.vue | 48 +++++++++++++++---- 7 files changed, 99 insertions(+), 34 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java index 04e1b6488..6278e7048 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java @@ -1,5 +1,6 @@ package com.ruoyi.system.fantang.controller; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -71,23 +72,30 @@ public class FtPrepaymentDaoController extends BaseController { // 查询所有待缴费列表 @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") @GetMapping("/listNoPrepay") - public TableDataInfo listNoPrepay() { + public TableDataInfo listNoPrepay(FtPrepaymentVo params) { startPage(); - return getDataTable(iFtPrepaymentDaoService.listNoPrepay()); + return getDataTable(iFtPrepaymentDaoService.listNoPrepay(params)); } // 查询所有已缴费列表 @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") @GetMapping("/listPrepay") - public AjaxResult listPrepay(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize) { - return AjaxResult.success(iFtPrepaymentDaoService.listPrepay(pageNum, pageSize)); + public TableDataInfo listPrepay(FtPrepaymentVo params) { + startPage(); + if (params.getPrepaidAt() != null) { + Date date = DateUtil.parse(params.getPrepaidAt().toString()); + params.setPrepaidAt(date); + } + return getDataTable(iFtPrepaymentDaoService.listPrepay(params)); } // 查询所有已结算列表 @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") @GetMapping("/listAllPrepay") - public TableDataInfo listAllPrepay() { - List list = iFtPrepaymentDaoService.listAllPrepay(); + public TableDataInfo listAllPrepay(FtPrepaymentVo params) { + startPage(); + + List list = iFtPrepaymentDaoService.listAllPrepay(params); return getDataTable(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java index ebf5bcd45..609d9ae87 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java @@ -85,7 +85,7 @@ public class FtPrepaymentDao implements Serializable { /** * 预付费时间 */ - @Excel(name = "预付费时间", width = 30, dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "预付费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private Date prepaidAt; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java index 0394402f1..4626358f7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.system.fantang.domain.FtOrderDao; import com.ruoyi.system.fantang.domain.FtPrepaymentDao; import com.ruoyi.system.fantang.domain.FtPrepaymentVo; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.Date; import java.util.List; /** @@ -18,12 +20,10 @@ import java.util.List; */ public interface FtPrepaymentDaoMapper extends BaseMapper { - @Select("select a.patient_id , a.name, a.hospital_id, a.bed_id, b.depart_name, b.depart_code from ft_patient a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where a.patient_id not in (select patient_id from ft_prepayment )") - List listNoPrepay(); + List listNoPrepay(FtPrepaymentVo params); - @Select("SELECT a.*,b.hospital_id, b.name, b.bed_id, c.depart_name from ft_prepayment a LEFT JOIN ft_patient b on a.patient_id = b.patient_id LEFT JOIN ft_depart c on b.depart_id = c.depart_id where a.settlement_flag = 0") - IPage listPrepay(Page page); + List listPrepay(FtPrepaymentVo params); + + List listAllPrepay(FtPrepaymentVo params); - @Select("SELECT a.*,b.hospital_id, b.name, b.bed_id, c.depart_name from ft_prepayment a LEFT JOIN ft_patient b on a.patient_id = b.patient_id LEFT JOIN ft_depart c on b.depart_id = c.depart_id where a.settlement_flag = 1") - List listAllPrepay(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java index 8c21b2004..b46688f7f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.fantang.domain.FtPrepaymentDao; import com.ruoyi.system.fantang.domain.FtPrepaymentVo; +import java.util.Date; import java.util.List; /** @@ -15,11 +16,11 @@ import java.util.List; */ public interface IFtPrepaymentDaoService extends IService { - List listNoPrepay(); + List listNoPrepay(FtPrepaymentVo params); - IPage listPrepay(Integer pageNum, Integer pageSize); + List listPrepay(FtPrepaymentVo params); - List listAllPrepay(); + List listAllPrepay(FtPrepaymentVo params); FtPrepaymentVo getCountById(Long patiendId); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java index b5b25f4ba..28c144090 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java @@ -11,6 +11,7 @@ import com.ruoyi.system.fantang.mapper.FtPrepaymentDaoMapper; import com.ruoyi.system.fantang.service.IFtPrepaymentDaoService; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -23,19 +24,18 @@ import java.util.List; public class FtPrepaymentDaoServiceImpl extends ServiceImpl implements IFtPrepaymentDaoService { @Override - public List listNoPrepay() { - return this.baseMapper.listNoPrepay(); + public List listNoPrepay(FtPrepaymentVo params) { + return this.baseMapper.listNoPrepay(params); } @Override - public IPage listPrepay(Integer pageNum, Integer pageSize) { - Page page = new Page<>(pageNum, pageSize); - return this.baseMapper.listPrepay(page); + public List listPrepay(FtPrepaymentVo params) { + return this.baseMapper.listPrepay(params); } @Override - public List listAllPrepay() { - return this.baseMapper.listAllPrepay(); + public List listAllPrepay(FtPrepaymentVo params) { + return this.baseMapper.listAllPrepay(params); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml index 4a52fa859..e0202260a 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml @@ -21,6 +21,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index 775c1781a..5e24b226a 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -59,7 +59,7 @@ size="mini" type="text" icon="el-icon-s-claim" - @click="handleUpdate(scope.row)" + @click="clickSettle(scope.row)" v-hasPermi="['fantang:prepayment:remove']" v-if="scope.row.noPrepayment" >出院结清 @@ -95,7 +95,10 @@ /> - + - +
确 定 - 取 消 + 关 闭 + 打印收据
@@ -211,7 +215,13 @@ export default { name: null, }, // 表单参数 - formAddPrepayment: {}, + formAddPrepayment: { + hospitalId: null, + name: null, + prepaid: null, + collectAt: null, + row: null + }, // 表单校验 rules: { prepaid: [ @@ -233,21 +243,39 @@ export default { }, methods: { + + clickPrintSettle() { + this.handleGenerateReceiptPdf(this.formAddPrepayment.row); + }, + + // 相应处理出院结清功能 + clickSettle(row) { + this.open = true; + getPrepayment(row.prepaymentId).then(response =>{ + console.log(response); + this.formAddPrepayment.hospitalId = row.hospitalId; + this.formAddPrepayment.name = row.name; + this.formAddPrepayment.collectAt = response.data.prepayment = response.data.collectAt; + this.formAddPrepayment.prepaid = response.data.prepaid; + this.formAddPrepayment.row = row; + }); + }, // 获取数据列表，跟进筛选条件不同获取不同类型的数据 getList() { if (this.queryParams.settlementFlag === 0) { // 查询已交预付费信息 listPrepay(this.queryParams).then(response => { - this.prepaymentList = response.data.records.map((item) => { + console.log(response); + this.prepaymentList = response.rows.map((item) => { console.log(item); item.noPrepayment = true; return item; }); - this.total = response.data.total; + this.total = response.total; this.loading = false; }) } else { - this.getDefaultNoPrepayment(); + this.getDefaultNoPrepayment(this.queryParams); } }, @@ -291,7 +319,7 @@ export default { }, buildSuggestionList() { - listNoPrepayment().then(response => { + listNoPrepayment(this.queryParams).then(response => { console.log("aaaaaaaaaaaaa", response); let prepaymentList = response.rows; this.suggestionList = prepaymentList.map(item => {