From 75cb81f0b88f313857ea431b46b929bef95d7cc8 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 29 七月 2024 10:36:59 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 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 8b37ba3..722e2bf 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 @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.smartor; +import com.github.pagehelper.ISelect; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -160,7 +161,14 @@ @PostMapping("/patInfoByContion") public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) { PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize()); - return getDataTable(patArchiveService.patInfoByContion(patArchive)); + List<PatArchive> patArchives = patArchiveService.patInfoByContion(patArchive); + long count = PageUtils.count(new ISelect() { + @Override + public void doSelect() { + patArchiveService.patInfoByContion(patArchive); + } + }); + return getDataTable2(count, patArchives); } @@ -181,4 +189,21 @@ util.exportExcel(response, patArchives, "鎮h�呮。妗堟暟鎹�"); } + /** + * 鑾峰彇鎮h�呬俊鎭� + */ + @ApiOperation("鑾峰彇鎮h�呬俊鎭�") + @PostMapping("/getPatientInfo") + public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) { + PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize()); + List<PatTaskRelevance> patientInfo = patArchiveService.getPatientInfo(patArchiveReq); + long count = PageUtils.count(new ISelect() { + @Override + public void doSelect() { + patArchiveService.getPatientInfo(patArchiveReq); + } + }); + return getDataTable2(count, patientInfo); + } + } -- Gitblit v1.9.3