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/BaseOrganizationController.java | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java
index e4bbb61..dd46693 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseOrganizationController.java
@@ -1,29 +1,21 @@
package com.ruoyi.web.controller.smartor;
-import java.util.List;
-
-import com.ruoyi.common.core.domain.entity.SysUser;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.BaseOrganization;
import com.smartor.service.IBaseOrganizationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 鏈烘瀯Controller
@@ -83,11 +75,10 @@
@ApiOperation("鏂板鏈烘瀯")
//@PreAuthorize("@ss.hasPermi('smartor:organization:add')")
@Log(title = "鏈烘瀯", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@RequestBody BaseOrganization baseOrganization)
{
- SysUser user = getLoginUser().getUser();
- baseOrganization.setOrgid(user.getOrgid());
return toAjax(baseOrganizationService.insertBaseOrganization(baseOrganization));
}
@@ -97,7 +88,9 @@
@ApiOperation("淇敼鏈烘瀯")
//@PreAuthorize("@ss.hasPermi('smartor:organization:edit')")
@Log(title = "鏈烘瀯", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
+
public AjaxResult edit(@RequestBody BaseOrganization baseOrganization)
{
return toAjax(baseOrganizationService.updateBaseOrganization(baseOrganization));
--
Gitblit v1.9.3