From c7ef5f837fe90766574cee9d0eae9e89e34af263 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 09 十月 2025 09:46:56 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 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 7533e6f..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
@@ -16,6 +16,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
@@ -24,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;
@@ -33,6 +35,7 @@
* @author smartor
* @date 2023-03-04
*/
+@Slf4j
@Api(description = "鎮ｈ�呮。妗�")
@RestController
@RequestMapping("/smartor/patarchive")
@@ -76,16 +79,16 @@
return success(patArchiveService.selectPatArchiveByPatid(patid));
}
-// /**
-// * 鏂板鎮ｈ�呮。妗�
-// */
-// @ApiOperation("鏂板鎮ｈ�呮。妗�")
-// //@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
-// @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
-// @PostMapping("/add")
-// public AjaxResult add(@RequestBody PatArchive patArchive) {
-// return toAjax(patArchiveService.insertPatArchive(patArchive));
-// }
+ /**
+ * 鏂板鎮ｈ�呮。妗�
+ */
+ @ApiOperation("鏂板鎮ｈ�呮。妗�")
+ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
+ @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody PatArchive patArchive) {
+ return toAjax(patArchiveService.insertPatArchive(patArchive));
+ }
/**
* 鏂板鎮ｈ�呮。妗�
@@ -173,7 +176,7 @@
@ApiOperation("鏌ヨ鎮ｈ�呭垪琛�")
@PostMapping("/patInfoByContion")
public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
-// PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
+// PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
patArchive.setOrgid(user.getOrgid());
@@ -187,6 +190,8 @@
long count = PageUtils.count(new ISelect() {
@Override
public void doSelect() {
+ patArchive.setPn(null);
+ patArchive.setPs(null);
patArchiveService.patInfoByContion(patArchive);
}
});
@@ -245,8 +250,9 @@
*/
@ApiOperation("鑾峰彇鎮ｈ�呬俊鎭�")
@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());
@@ -257,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