From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 25bdd98..598c620 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -3,6 +3,8 @@
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,6 +94,23 @@
rspData.setMsg("鏌ヨ鎴愬姛");
rspData.setRows(list);
rspData.setTotal(total);
+ return rspData;
+ }
+
+ protected Map<String, Object> getDataTable3(long total, Object object) {
+ Map<String, Object> rspData = new TreeMap<>();
+ rspData.put("code", HttpStatus.SUCCESS);
+ rspData.put("msg", "鏌ヨ鎴愬姛");
+ rspData.put("rows", object);
+ rspData.put("total", total);
+ return rspData;
+ }
+ protected Map<String, Object> getDataTable4(long total, Object object) {
+ Map<String, Object> rspData = new TreeMap<>();
+ rspData.put("code", HttpStatus.SUCCESS);
+ rspData.put("msg", "鏌ヨ鎴愬姛");
+ rspData.put("data", object);
+ rspData.put("total", total);
return rspData;
}
@@ -191,6 +210,7 @@
public String getUsername() {
return getLoginUser().getUsername();
}
+
/**
* 鑾峰彇鏈烘瀯ID
*/
--
Gitblit v1.9.3