From 81a2e5578eddb80de73252244fca7cd7903c3f17 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Wed, 2 Dec 2020 09:50:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=A2=84=E4=BB=98=E8=B4=B9?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=94=B6=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +++++++- .../controller/FtPrepaymentDaoController.java | 6 ++---- .../fantang/service/IFtPrepaymentDaoService.java | 2 +- .../service/impl/FtPrepaymentDaoServiceImpl.java | 6 +++--- .../com/ruoyi/system/fantang/vo/FtPrepaymentVo.java | 2 +- ruoyi-ui/src/api/fantang/prepayment.js | 11 ++++++++++- ruoyi-ui/src/views/fantang/prepayment/index.vue | 12 ++++++++---- 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index e0767c60b..6f972db74 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,13 @@ springfox-swagger-ui ${swagger.version} - + + + org.springframework.boot + spring-boot-devtools + + true + commons-io 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 f6d955b37..c7654ab35 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 @@ -36,7 +36,8 @@ public class FtPrepaymentDaoController extends BaseController { @GetMapping("/getCountById/{patientId}") public AjaxResult getCountById(@PathVariable("patientId") Long patiendId) { - return AjaxResult.success(iFtPrepaymentDaoService.getCountById(patiendId)); + FtPrepaymentVo dao = iFtPrepaymentDaoService.getCountById(patiendId); + return AjaxResult.success("操作成功", dao); } @@ -128,9 +129,6 @@ public class FtPrepaymentDaoController extends BaseController { Long patientId = ftPrepaymentDao.getPatientId(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("patient_id", patientId); - if (iFtPrepaymentDaoService.getOne(wrapper).getSettlementFlag() == 1) { - return AjaxResult.error("该病人已付费"); - } ftPrepaymentDao.setCollectAt(new Date()); ftPrepaymentDao.setSettlementFlag(0); 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 ff46e4337..161a0fb65 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 @@ -19,5 +19,5 @@ public interface IFtPrepaymentDaoService extends IService { List listAllPrepay(); - int getCountById(Long patiendId); + 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 1301b9ad5..732a74d44 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 @@ -34,10 +34,10 @@ public class FtPrepaymentDaoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("patiendId",patiendId); - return this.baseMapper.selectCount(queryWrapper); + queryWrapper.eq("patient_Id",patiendId); + return this.baseMapper.selectOne(queryWrapper); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java index ebd2d80af..e342b0891 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java @@ -66,7 +66,7 @@ public class FtPrepaymentVo implements Serializable { /** * 收款员 */ - private Long collectBy; + private String collectBy; /** * 结算时间 diff --git a/ruoyi-ui/src/api/fantang/prepayment.js b/ruoyi-ui/src/api/fantang/prepayment.js index 99c5332c0..2be85ef03 100644 --- a/ruoyi-ui/src/api/fantang/prepayment.js +++ b/ruoyi-ui/src/api/fantang/prepayment.js @@ -7,6 +7,7 @@ export function listNoPrepayment() { method: 'get', }) } + // 查询所有已缴预付费病人列表 export function listPrepay() { return request({ @@ -23,7 +24,14 @@ export function listAllPrepay() { }) } -// 查询该用户是否已经收取预付伙食费 +/** + * 查询该用户是否已经收取预付伙食费 + * 作者： 陈智兴 + * 日期： 2020年12月2日 + * 功能： 前端调用查询 + * @param patientId + */ +// export function getCountById(patientId) { return request({ url: '/fantang/prepayment/getCountById/' + patientId, @@ -40,6 +48,7 @@ export function listPrepayment(query) { }) } + // 查询收费管理详细 export function getPrepayment(prepaymentId) { return request({ diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index f9bfa46f5..76206fc7a 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -195,7 +195,7 @@ listNoPrepayment, updatePrepayment } from "@/api/fantang/prepayment"; - import {listAllPrepay, listPrepay} from "../../../api/fantang/prepayment"; + import {getCountById, listAllPrepay, listPrepay} from "../../../api/fantang/prepayment"; import {getUserProfile} from "../../../api/system/user"; export default { @@ -204,7 +204,7 @@ data() { return { // 权限相关的参数 - userName: null, + user: null, roleGroup: null, postGroup: null, @@ -275,7 +275,7 @@ // 获取用户相关信息 myGetUser() { getUserProfile().then(response => { - this.userName = response.data; + this.user = response.data; this.roleGroup = response.roleGroup; this.postGroup = response.postGroup; }); @@ -428,7 +428,7 @@ /** 提交按钮 */ submitformAddPrepayment() { let hospitalId = this.formAddPrepayment.hospitalId; - this.formAddPrepayment.collectBy = this.userName; + this.formAddPrepayment.collectBy = this.user.userName; this.$refs["formAddPrepayment"].validate(valid => { if (valid) { if (!this.NoPrepayments.find(function(x) { @@ -438,6 +438,10 @@ return ; } + getCountById(this.formAddPrepayment.patientId).then(response => { + console.log("getCountbyId", response); + }); + this.formAddPrepayment.prepaidAt = null; console.log("form -->", this.formAddPrepayment)