From c2b8fdfd594d68574325d94eff312c8c00b6b73a Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期日, 06 七月 2025 16:44:57 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 22 +++++++++++++++++++++- 1 files changed, 21 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 f77ae57..addda39 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,6 +1,7 @@ package com.ruoyi.web.controller.smartor; import com.github.pagehelper.ISelect; +import com.github.pagehelper.PageInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -59,7 +60,18 @@ @ApiOperation("鑾峰彇鎮h�呬俊鎭�") @PostMapping("/getPatientInfoQC") public TableDataInfo getPatientInfoQC(@RequestBody PatArchiveReq patArchiveReq) { - PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize()); + if (patArchiveReq.getAllhosp() != 2) + PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize()); + else { + //鍥犱负闂ㄨ瘖鏁版嵁閲忓ぇ锛屼笉鑳藉啀鐢ㄦ鏋剁殑鍒嗛潰锛屽彧鑳借嚜宸卞啀閫犲垎椤靛瓧娈碉紝杩涜鍒嗛〉鏌ヨ鏁版嵁锛堝鏋滅敤鑷甫鐨刾ageSize,妗嗘灦浼氬湪SQL鍚庨潰鍐嶅姞涓�涓狶imit,瀵艰嚧鑷繁瀹氫箟鐨凩imit涓嶈兘鐢ㄤ簡锛� + PageUtils.clearPage(); + patArchiveReq.setPageSizeMZ(patArchiveReq.getPageSize()); + patArchiveReq.setPageNumMZ(patArchiveReq.getPageNum()); + patArchiveReq.setPageNum(null); + patArchiveReq.setPageSize(null); + } + + if (CollectionUtils.isEmpty(patArchiveReq.getLeavehospitaldistrictcodes()) || patArchiveReq.getLeavehospitaldistrictcodes().size() == 0) { patArchiveReq.setLeavehospitaldistrictcodes(null); } @@ -67,6 +79,14 @@ patArchiveReq.setLeaveldeptcodes(null); } List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfoQC(patArchiveReq); + + if (patArchiveReq.getAllhosp() == 2) { + //鍥犱负闂ㄨ瘖鐨勬暟鎹噺澶э紝娌℃硶鍐嶇敤妗嗘灦鐨勫垎椤碉紝鍙兘鑷繁鏌ヨ + Long count = patArchiveService.selectPatArchiveInfoByOuthospQCCount(patArchiveReq); + return getDataTable2(count, patientInfo); + } + + long count = PageUtils.count(new ISelect() { @Override public void doSelect() { -- Gitblit v1.9.3