From c80135e5c3f7bfab96ba558a910a06f1e587c53c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:14:04 +0800
Subject: [PATCH] 1.新增@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") 2.将新增orgid的拦截器关掉 3.登陆新增campusid
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 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 83c71e8..9107aa3 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,7 +1,9 @@
package com.ruoyi.web.controller.smartor;
import com.github.pagehelper.ISelect;
+import com.ruoyi.common.annotation.AddOrgId;
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 +26,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;
@@ -48,7 +51,8 @@
*/
@ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
public TableDataInfo list(@RequestBody PatArchive patArchive) {
PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
@@ -85,6 +89,7 @@
@ApiOperation("鏂板鎮ｈ�呮。妗�")
//@PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
@Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatArchive patArchive) {
return toAjax(patArchiveService.insertPatArchive(patArchive));
@@ -224,8 +229,10 @@
*/
@ApiOperation("鑾峰彇鎮ｈ�呬俊鎭�")
@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 +243,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.size());
+ return map;
}
/**
@@ -262,18 +273,13 @@
if (CollectionUtils.isEmpty(patArchiveReq.getLeaveldeptcodes()) || patArchiveReq.getLeaveldeptcodes().size() == 0) {
patArchiveReq.setLeaveldeptcodes(null);
}
+ System.out.println("--------11111111:" + patArchiveReq);
List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfoQC(patArchiveReq);
-
+ System.out.println("--------222222:" + patientInfo.size());
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