From 7ca6d7d7da579f9a32c7d253eccb0f4e1ba6b6ef Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 20 一月 2026 14:01:55 +0800
Subject: [PATCH] 【丽水】/smartor/patarchive/patInfoByContion、/smartor/patarchive/exportPatInfo、/smartor/patarchive/getPatientInfoQC 调整sql，不关联pat_archivetag
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 a5318fe..725363a 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.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
@@ -50,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);
@@ -87,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));
@@ -270,14 +273,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