From 1ecb6109954d22e9be03518d64cdcfd89b599091 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 02 六月 2026 18:20:11 +0800
Subject: [PATCH] 1.处理修改service_task时，子任务删除，未将出院数据还原的问题； 2.新增省立同德满意度接口 3.处理患者基本信息并发新增的问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
index 03dae7c..9a58888 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
@@ -1,9 +1,15 @@
package com.ruoyi.web.controller.smartor;
import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.annotation.AddOrgId;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,11 +35,10 @@
* @author lihu
* @date 2025-02-24
*/
-@Api("妯℃澘绉戝鍏宠仈")
+@Api("璇婃柇妯℃澘绉戝鍏宠仈")
@RestController
@RequestMapping("/smartor/taskdiag")
-public class ServiceTaskdiagController extends BaseController
-{
+public class ServiceTaskdiagController extends BaseController {
@Autowired
private IServiceTaskdiagService serviceTaskdiagService;
@@ -42,12 +47,24 @@
*/
@ApiOperation("鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceTaskdiag serviceTaskdiag)
- {
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("list")
+ public TableDataInfo list(@RequestBody ServiceTaskdiag serviceTaskdiag) {
startPage();
List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃涓嶅垎椤�
+ */
+ @ApiOperation("鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃涓嶅垎椤�")
+ //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("listnopage")
+ public Map<String, Object> listnopage(@RequestBody ServiceTaskdiag serviceTaskdiag) {
+ List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
+ return getDataTable3(CollectionUtils.isEmpty(list) ? 0 : list.size(), list);
}
/**
@@ -57,8 +74,7 @@
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:export')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ServiceTaskdiag serviceTaskdiag)
- {
+ public void export(HttpServletResponse response, ServiceTaskdiag serviceTaskdiag) {
List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
ExcelUtil<ServiceTaskdiag> util = new ExcelUtil<ServiceTaskdiag>(ServiceTaskdiag.class);
util.exportExcel(response, list, "妯℃澘绉戝鍏宠仈鏁版嵁");
@@ -70,8 +86,7 @@
@ApiOperation("鑾峰彇妯℃澘绉戝鍏宠仈璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(serviceTaskdiagService.selectServiceTaskdiagById(id));
}
@@ -81,9 +96,9 @@
@ApiOperation("鏂板妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:add')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody ServiceTaskdiag serviceTaskdiag)
- {
+ public AjaxResult add(@RequestBody ServiceTaskdiag serviceTaskdiag) {
return toAjax(serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag));
}
@@ -93,9 +108,9 @@
@ApiOperation("淇敼妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:edit')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@RequestBody ServiceTaskdiag serviceTaskdiag)
- {
+ public AjaxResult edit(@RequestBody ServiceTaskdiag serviceTaskdiag) {
return toAjax(serviceTaskdiagService.updateServiceTaskdiag(serviceTaskdiag));
}
@@ -105,9 +120,8 @@
@ApiOperation("鍒犻櫎妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:remove')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(serviceTaskdiagService.deleteServiceTaskdiagByIds(ids));
+ @GetMapping("/remove/{id}")
+ public AjaxResult remove(@PathVariable Long id) {
+ return toAjax(serviceTaskdiagService.deleteServiceTaskdiagById(id));
}
}
--
Gitblit v1.9.3