更新预付费数据列，默认显示已付费的数据，查询切换可以查看未付费的病患。

ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java

@@ -68,18 +68,15 @@ public class FtPrepaymentDaoController extends BaseController {
     // 查询所有待缴费列表
     @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')")
     @GetMapping("/listNoPrepay")
-    public TableDataInfo listNoPrepay() {
+    public AjaxResult listNoPrepay(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize) {
-        startPage();
+        return AjaxResult.success(iFtPrepaymentDaoService.listNoPrepay(pageNum, pageSize));
-        List<FtPrepaymentVo> list = iFtPrepaymentDaoService.listNoPrepay();
-        return getDataTable(list);
     }
 
     // 查询所有已缴费列表
     @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')")
     @GetMapping("/listPrepay")
-    public TableDataInfo listPrepay() {
+    public AjaxResult listPrepay(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize) {
-        List<FtPrepaymentVo> list = iFtPrepaymentDaoService.listPrepay();
+        return AjaxResult.success(iFtPrepaymentDaoService.listPrepay(pageNum, pageSize));
-        return getDataTable(list);
     }
 
     // 查询所有已结算列表

ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.fantang.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.Select;
@@ -16,10 +19,10 @@ import java.util.List;
 public interface FtPrepaymentDaoMapper extends BaseMapper<FtPrepaymentDao> {
 
     @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<FtPrepaymentVo> listNoPrepay();
+    IPage<FtPrepaymentVo> listNoPrepay(Page<FtOrderDao> page);
 
     @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")
-    List<FtPrepaymentVo> listPrepay();
+    IPage<FtPrepaymentVo> listPrepay(Page<FtOrderDao> page);
 
     @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<FtPrepaymentVo> listAllPrepay();

ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.fantang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.fantang.domain.FtPrepaymentDao;
 import com.ruoyi.system.fantang.domain.FtPrepaymentVo;
@@ -14,9 +15,9 @@ import java.util.List;
  */
 public interface IFtPrepaymentDaoService extends IService<FtPrepaymentDao> {
 
-    List<FtPrepaymentVo> listNoPrepay();
+    IPage<FtPrepaymentVo> listNoPrepay(Integer pageNum, Integer pageSize);
 
-    List<FtPrepaymentVo> listPrepay();
+    IPage<FtPrepaymentVo> listPrepay(Integer pageNum, Integer pageSize);
 
     List<FtPrepaymentVo> listAllPrepay();
 

ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java

@@ -1,7 +1,10 @@
 package com.ruoyi.system.fantang.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.fantang.domain.FtOrderDao;
 import com.ruoyi.system.fantang.domain.FtPrepaymentDao;
 import com.ruoyi.system.fantang.domain.FtPrepaymentVo;
 import com.ruoyi.system.fantang.mapper.FtPrepaymentDaoMapper;
@@ -20,13 +23,15 @@ import java.util.List;
 public class FtPrepaymentDaoServiceImpl extends ServiceImpl<FtPrepaymentDaoMapper, FtPrepaymentDao> implements IFtPrepaymentDaoService {
 
     @Override
-    public List<FtPrepaymentVo> listNoPrepay() {
+    public IPage<FtPrepaymentVo> listNoPrepay(Integer pageNum, Integer pageSize) {
-        return this.baseMapper.listNoPrepay();
+        Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
+        return this.baseMapper.listNoPrepay(page);
     }
 
     @Override
-    public List<FtPrepaymentVo> listPrepay() {
+    public IPage<FtPrepaymentVo> listPrepay(Integer pageNum, Integer pageSize) {
-        return this.baseMapper.listPrepay();
+        Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
+        return this.baseMapper.listPrepay(page);
     }
 
     @Override

ruoyi-ui/src/api/fantang/prepayment.js

@@ -1,18 +1,20 @@
 import request from '@/utils/request'
 
 // 查询所有未缴预付费病人列表
-export function listNoPrepayment() {
+export function listNoPrepayment(query) {
   return request({
     url: '/fantang/prepayment/listNoPrepay',
     method: 'get',
+    params: query
   })
 }
 
 // 查询所有已缴预付费病人列表
-export function listPrepay() {
+export function listPrepay(query) {
   return request({
     url: '/fantang/prepayment/listPrepay',
     method: 'get',
+    params: query
   })
 }
 

ruoyi-ui/src/views/fantang/prepayment/index.vue

@@ -98,12 +98,12 @@
       <el-table-column label="科室" align="center" prop="departName" width="180">
       </el-table-column>
       <el-table-column label="床号" align="center" prop="bedId"/>
-      <el-table-column label="结算" align="center" prop="settlementFlag" :formatter="formatSettlementFlag"/>
+      <el-table-column label="结算" align="center" prop="prepaid" />
-      <el-table-column label="结算时间" align="center" prop="settlementAt" width="180">
+<!--      <el-table-column label="结算时间" align="center" prop="settlementAt" width="180">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <span>{{ parseTime(scope.row.settlementAt, '{y}-{m}-{d}') }}</span>
+<!--          <span>{{ parseTime(scope.row.settlementAt, '{y}-{m}-{d}') }}</span>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -131,7 +131,7 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      @pagination="getDefaultNoPrepayment"
+      @pagination="getList"
     />
 
     <!-- 添加或修改收费管理对话框 -->
@@ -194,7 +194,7 @@
     listPrepayment,
     listNoPrepayment,
     updatePrepayment
-  } from "@/api/fantang/prepayment";
+  } from "../../../api/fantang/prepayment";
   import {getCountById, listAllPrepay, listPrepay} from "../../../api/fantang/prepayment";
   import {getUserProfile} from "../../../api/system/user";
 
@@ -209,15 +209,12 @@
         postGroup: null,
 
         settlementFlagOptions: [{
-          value: null,
-          label: '未交费'
-        }, {
           value: 0,
-          label: '未结算'
+          label: '已缴费'
         }, {
           value: 1,
-          label: '已结算'
+          label: '未交费'
-        }, ],
+        }],
         suggestionList: [],
         NoPrepayments: [],
         state: '',
@@ -245,7 +242,7 @@
           pageSize: 10,
           collectAt: null,
           settlementAt: null,
-          settlementFlag: null,
+          settlementFlag: 0,
           prepaid: null,
           prepaidAt: null,
           hospitalId: null,
@@ -264,14 +261,30 @@
         }
       };
     },
+
     created() {
-      this.getDefaultNoPrepayment();
+      this.getList();
       this.myGetUser();
     },
     mounted() {
     },
 
     methods: {
+      // 获取数据列表，跟进筛选条件不同获取不同类型的数据
+      getList() {
+        if (this.queryParams.settlementFlag === 0) {
+          // 查询已交预付费信息
+          listPrepay(this.queryParams).then(response => {
+            this.prepaymentList = response.data.records;
+            this.total = response.data.total;
+            this.loading = false;
+          })
+        } else {
+          this.getDefaultNoPrepayment();
+        }
+
+      },
+
       // 获取用户相关信息
       myGetUser() {
         getUserProfile().then(response => {
@@ -282,31 +295,9 @@
       },
       // 处理筛选结算标志
       selectSettlementFlag(value) {
-        console.log("value", value)
+        this.getList();
-        if (value === null) {
-          this.getDefaultNoPrepayment();
-        } else if (value === 0) {
-          this.loading = true;
-          listPrepay().then(response => {
-            this.prepaymentList = response.rows;
-            this.loading = false;});
-        } else {
-          this.loading = true;
-          listAllPrepay().then(response => {
-            this.prepaymentList = response.rows;
-            this.loading = false;
-          });
-        }
       },
 
-      // 格式化结算标志回显
-      formatSettlementFlag(row) {
-        if (row.settlementFlag === null)
-          return "未交费";
-        if (row.settlementFlag === 1)
-          return "已结算";
-        return "未结算";
-      },
       // 响应自动查询回显
       querySearch(queryString, cb) {
         var restaurants = this.suggestionList;
@@ -329,8 +320,9 @@
       getDefaultNoPrepayment() {
         this.loading = true;
         listNoPrepayment(this.queryParams).then(response => {
-          this.NoPrepayments = response.rows;
+          this.prepaymentList = response.data.records;
-          this.suggestionList = this.NoPrepayments.map(item => {
+          this.total = response.data.total;
+          this.suggestionList = this.prepaymentList.map(item => {
             return {
               "value": item.hospitalId,
               "departName": item.departName,