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/system/SysDictDataController.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index 6b8e744..6935191 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -1,8 +1,13 @@
package com.ruoyi.web.controller.system;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.AddOrgId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -32,8 +37,7 @@
*/
@RestController
@RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
+public class SysDictDataController extends BaseController {
@Autowired
private ISysDictDataService dictDataService;
@@ -42,8 +46,7 @@
//@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list")
- public TableDataInfo list(SysDictData dictData)
- {
+ public TableDataInfo list(SysDictData dictData) {
startPage();
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
return getDataTable(list);
@@ -52,8 +55,7 @@
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
//@PreAuthorize("@ss.hasPermi('system:dict:export')")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysDictData dictData)
- {
+ public void export(HttpServletResponse response, SysDictData dictData) {
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
util.exportExcel(response, list, "瀛楀吀鏁版嵁");
@@ -64,8 +66,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictCode}")
- public AjaxResult getInfo(@PathVariable Long dictCode)
- {
+ public AjaxResult getInfo(@PathVariable Long dictCode) {
return success(dictDataService.selectDictDataById(dictCode));
}
@@ -73,14 +74,33 @@
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
*/
@GetMapping(value = "/type/{dictType}")
- public AjaxResult dictType(@PathVariable String dictType)
- {
+ public AjaxResult dictType(@PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
- if (StringUtils.isNull(data))
- {
+ if (StringUtils.isNull(data)) {
data = new ArrayList<SysDictData>();
}
return success(data);
+ }
+
+ /**
+ * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅(澶栭摼)
+ */
+ @GetMapping(value = "/typeout/{dictType}")
+ public AjaxResult dictTypeOut(@PathVariable String dictType) {
+ if (dictType == null) return error();
+ List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+ if (StringUtils.isNull(data) || data.isEmpty()) {
+ return error("瀛楀吀鏁版嵁涓嶅瓨鍦�");
+ }
+
+ List<Map<String, Object>> list = data.stream().map(item -> {
+ Map<String, Object> map = new HashMap<>();
+ map.put("dictLabel", item.getDictLabel());
+ map.put("dictValue", item.getDictValue());
+ map.put("listClass", item.getListClass());
+ return map;
+ }).collect(Collectors.toList());
+ return success(list);
}
/**
@@ -88,9 +108,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:add')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@Validated @RequestBody SysDictData dict)
- {
+ public AjaxResult add(@Validated @RequestBody SysDictData dict) {
dict.setCreateBy(getUsername());
return toAjax(dictDataService.insertDictData(dict));
}
@@ -100,9 +120,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:dict:edit')")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
- public AjaxResult edit(@Validated @RequestBody SysDictData dict)
- {
+ public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
dict.setUpdateBy(getUsername());
return toAjax(dictDataService.updateDictData(dict));
}
@@ -113,8 +133,7 @@
//@PreAuthorize("@ss.hasPermi('system:dict:remove')")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@GetMapping("/remove/{dictCodes}")
- public AjaxResult remove(@PathVariable Long[] dictCodes)
- {
+ public AjaxResult remove(@PathVariable Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes);
return success();
}
--
Gitblit v1.9.3