From 355087c24ad9a2f73ae74662b207c4d0f7b0f7a0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 十月 2025 18:24:33 +0800
Subject: [PATCH] 修改省立同德的短信功能

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 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 107db8d..f04d30c 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
@@ -2,6 +2,7 @@
 
 import com.github.pagehelper.ISelect;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -24,6 +25,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
@@ -224,8 +226,10 @@
      */
     @ApiOperation("鑾峰彇鎮h�呬俊鎭�")
     @PostMapping("/getPatientInfo")
-    public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
-        PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
+    public Map<String, Object> getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
+        if (patArchiveReq.getPageSize() != null && patArchiveReq.getPageNum() != null)
+            patArchiveReq.setPageNum(PageUtils.getOffset(patArchiveReq.getPageNum(), patArchiveReq.getPageSize()));
+
         LoginUser loginUser = getLoginUser();
         SysUser user = loginUser.getUser();
         patArchiveReq.setOrgid(user.getOrgid());
@@ -236,13 +240,17 @@
             patArchiveReq.setLeaveldeptcodes(null);
         }
         List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
-        long count = PageUtils.count(new ISelect() {
-            @Override
-            public void doSelect() {
-                patArchiveService.getPatientInfo(patArchiveReq);
-            }
-        });
-        return getDataTable2(count, patientInfo);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", HttpStatus.SUCCESS);
+        map.put("msg", "鏌ヨ鎴愬姛");
+        map.put("rows", patientInfo);
+
+        patArchiveReq.setPageNum(null);
+        patArchiveReq.setPageSize(null);
+        List<PatArchiveOthreInfo> count = patArchiveService.getPatientInfo(patArchiveReq);
+        map.put("total", count);
+        return map;
     }
 
     /**

--
Gitblit v1.9.3