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-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
index 3388775..cc3a750 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseUserInfoController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
@@ -37,7 +38,8 @@
*/
@ApiOperation("鏌ヨ鐢ㄦ埛鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:info:list')")
- @PostMapping("/list")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("list")
public TableDataInfo list(@RequestBody BaseUserInfo baseUserInfo) {
startPage();
List<BaseUserInfo> list = baseUserInfoService.selectBaseUserInfoList(baseUserInfo);
@@ -73,10 +75,9 @@
@ApiOperation("鏂板鐢ㄦ埛")
//@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody BaseUserInfo baseUserInfo) {
- SysUser user = getLoginUser().getUser();
- baseUserInfo.setOrgid(user.getOrgid());
return toAjax(baseUserInfoService.insertBaseUserInfo(baseUserInfo));
}
@@ -86,7 +87,8 @@
@ApiOperation("淇敼鐢ㄦ埛")
//@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "鐢ㄦ埛", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@RequestBody BaseUserInfo baseUserInfo) {
return toAjax(baseUserInfoService.updateBaseUserInfo(baseUserInfo));
}
@@ -110,6 +112,7 @@
* @return
*/
@ApiOperation("鑾峰彇浜哄憳鐨勮仈绯绘柟寮�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@GetMapping("/reportContent")
public AjaxResult getContact(@RequestParam("personCode") String personCode, @RequestParam("noticeWay") String noticeWay) {
if (StringUtils.isEmpty(personCode) || StringUtils.isEmpty(noticeWay)) {
--
Gitblit v1.9.3