From 55f5271f893a25a7be671b24938e49976936a67b Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 29 九月 2025 18:30:00 +0800 Subject: [PATCH] 新增Orgid --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 49 ++++++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java index d0f6fa1..83c71e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java @@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -78,16 +79,16 @@ return success(patArchiveService.selectPatArchiveByPatid(patid)); } -// /** -// * 鏂板鎮h�呮。妗� -// */ -// @ApiOperation("鏂板鎮h�呮。妗�") -// //@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')") -// @Log(title = "鎮h�呮。妗�", businessType = BusinessType.INSERT) -// @PostMapping("/add") -// public AjaxResult add(@RequestBody PatArchive patArchive) { -// return toAjax(patArchiveService.insertPatArchive(patArchive)); -// } + /** + * 鏂板鎮h�呮。妗� + */ + @ApiOperation("鏂板鎮h�呮。妗�") + //@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')") + @Log(title = "鎮h�呮。妗�", businessType = BusinessType.INSERT) + @PostMapping("/add") + public AjaxResult add(@RequestBody PatArchive patArchive) { + return toAjax(patArchiveService.insertPatArchive(patArchive)); + } /** * 鏂板鎮h�呮。妗� @@ -189,8 +190,8 @@ long count = PageUtils.count(new ISelect() { @Override public void doSelect() { - patArchive.setPageNum(null); - patArchive.setPageSize(null); + patArchive.setPn(null); + patArchive.setPs(null); patArchiveService.patInfoByContion(patArchive); } }); @@ -249,8 +250,9 @@ */ @ApiOperation("鑾峰彇鎮h�呬俊鎭�") @PostMapping("/getPatientInfoQC") - public TableDataInfo getPatientInfoQC(@RequestBody PatArchiveReq patArchiveReq) { - PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize()); + public Map<String, Object> getPatientInfoQC(@RequestBody PatArchiveReq patArchiveReq) { + patArchiveReq.setPageNum(PageUtils.getOffset(patArchiveReq.getPageNum(), patArchiveReq.getPageSize())); + LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); patArchiveReq.setOrgid(user.getOrgid()); @@ -261,13 +263,18 @@ patArchiveReq.setLeaveldeptcodes(null); } List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfoQC(patArchiveReq); - long count = PageUtils.count(new ISelect() { - @Override - public void doSelect() { - patArchiveService.getPatientInfoQC(patArchiveReq); - } - }); - return getDataTable2(count, patientInfo); + + patArchiveReq.setPageSize(null); + patArchiveReq.setPageNum(null); + List<PatArchiveOthreInfo> patientInfoQC = patArchiveService.getPatientInfoQC(patArchiveReq); + +// long count = PageUtils.count(new ISelect() { +// @Override +// public void doSelect() { +// patArchiveService.getPatientInfoQC(patArchiveReq); +// } +// }); + return getDataTable3(patientInfoQC.size(), patientInfo); } } -- Gitblit v1.9.3