abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
czx 2020-12-01 15:30:44 +08:00
commit d61517cf46
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package com.ruoyi.system.fantang.controller; package com.ruoyi.system.fantang.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
@ -47,6 +48,7 @@ public class FtPrepaymentDaoController extends BaseController {
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> list = iFtPrepaymentDaoService.listPrepay(); List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> list = iFtPrepaymentDaoService.listPrepay();
return getDataTable(list); return getDataTable(list);
} }
// 查询所有已结算列表 // 查询所有已结算列表
@PreAuthorize("@ss.hasPermi('fantang:prepayment:list')") @PreAuthorize("@ss.hasPermi('fantang:prepayment:list')")
@GetMapping("/listAllPrepay") @GetMapping("/listAllPrepay")
@ -115,6 +117,14 @@ public class FtPrepaymentDaoController extends BaseController {
@Log(title = "收费管理", businessType = BusinessType.INSERT) @Log(title = "收费管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody FtPrepaymentVo ftPrepaymentDao) { public AjaxResult add(@RequestBody FtPrepaymentVo ftPrepaymentDao) {
Long patientId = ftPrepaymentDao.getPatientId();
QueryWrapper<FtPrepaymentVo> wrapper = new QueryWrapper<>();
wrapper.eq("patient_id", patientId);
if (iFtPrepaymentDaoService.getOne(wrapper).getSettlementFlag() == 1) {
return AjaxResult.error("该病人已付费");
}
ftPrepaymentDao.setCollectAt(new Date()); ftPrepaymentDao.setCollectAt(new Date());
ftPrepaymentDao.setSettlementFlag(0); ftPrepaymentDao.setSettlementFlag(0);
return toAjax(iFtPrepaymentDaoService.save(ftPrepaymentDao) ? 1 : 0); return toAjax(iFtPrepaymentDaoService.save(ftPrepaymentDao) ? 1 : 0);