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/SvyLibTemplateTargetoptionController.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java
index 4816961..1442fa9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateTargetoptionController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+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;
@@ -24,8 +25,7 @@
*/
@RestController
@RequestMapping("/smartor/svytargetoption")
-public class SvyLibTemplateTargetoptionController extends BaseController
-{
+public class SvyLibTemplateTargetoptionController extends BaseController {
@Autowired
private ISvyLibTemplateTargetoptionService svyLibTemplateTargetoptionService;
@@ -34,8 +34,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:list')")
@GetMapping("/list")
- public TableDataInfo list(SvyLibTemplateTargetoption svyLibTemplateTargetoption)
- {
+ public TableDataInfo list(SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
startPage();
List<SvyLibTemplateTargetoption> list = svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
return getDataTable(list);
@@ -47,8 +46,7 @@
//@PreAuthorize("@ss.hasPermi('system:targetoption:export')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyLibTemplateTargetoption svyLibTemplateTargetoption)
- {
+ public void export(HttpServletResponse response, SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
List<SvyLibTemplateTargetoption> list = svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
ExcelUtil<SvyLibTemplateTargetoption> util = new ExcelUtil<SvyLibTemplateTargetoption>(SvyLibTemplateTargetoption.class);
util.exportExcel(response, list, "闂嵎闂鎸囨爣閫夐」搴撴暟鎹�");
@@ -59,8 +57,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyLibTemplateTargetoptionService.selectSvyLibTemplateTargetoptionById(id));
}
@@ -69,9 +66,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:add')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
SysUser user = getLoginUser().getUser();
svyLibTemplateTargetoption.setOrgid(user.getOrgid());
return toAjax(svyLibTemplateTargetoptionService.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption));
@@ -82,9 +79,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:edit')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody SvyLibTemplateTargetoption svyLibTemplateTargetoption) {
return toAjax(svyLibTemplateTargetoptionService.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption));
}
@@ -93,9 +90,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:targetoption:remove')")
@Log(title = "闂嵎闂鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyLibTemplateTargetoptionService.deleteSvyLibTemplateTargetoptionByIds(ids));
}
}
--
Gitblit v1.9.3