From 6366d3a0e3520e2fd1e81ada00dfa2c8dd1a910c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 七月 2026 12:43:31 +0800
Subject: [PATCH] 患者过滤查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 9107aa3..34ac743 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
@@ -53,10 +53,14 @@
//@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("list")
- public TableDataInfo list(@RequestBody PatArchive patArchive) {
- PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
+ public Map<String, Object> list(@RequestBody PatArchive patArchive) {
+ patArchive.setPageNum(PageUtils.getOffset(patArchive.getPageNum(), patArchive.getPageSize()));
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
- return getDataTable(list);
+ patArchive.setPageNum(null);
+ patArchive.setPageSize(null);
+ List<PatArchive> patArchives = patArchiveService.selectPatArchiveList(patArchive);
+
+ return getDataTable3(patArchives.size(), list);
}
/**
@@ -273,14 +277,14 @@
if (CollectionUtils.isEmpty(patArchiveReq.getLeaveldeptcodes()) || patArchiveReq.getLeaveldeptcodes().size() == 0) {
patArchiveReq.setLeaveldeptcodes(null);
}
- System.out.println("--------11111111:" + patArchiveReq);
+ System.out.println("鑾峰彇鎮ｈ�呬俊鎭�-鍏ュ弬patArchiveReq:" + patArchiveReq);
List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfoQC(patArchiveReq);
- System.out.println("--------222222:" + patientInfo.size());
+ System.out.println("鑾峰彇鎮ｈ�呬俊鎭�-杩斿洖patientInfo:" + patientInfo.size());
patArchiveReq.setPageSize(null);
patArchiveReq.setPageNum(null);
- List<PatArchiveOthreInfo> patientInfoQC = patArchiveService.getPatientInfoQC(patArchiveReq);
- return getDataTable3(patientInfoQC.size(), patientInfo);
+ Long count = patArchiveService.getPatientInfoQCCount(patArchiveReq);
+ return getDataTable3(count, patientInfo);
}
}
--
Gitblit v1.9.3