From fc1f48f6cb2736bf03b7750563e5d9830d6fd4ba Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:49:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/smartor_ls_261103' into smartor_ls_261103
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java
index d45ab08..240ae2a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/Icd10Controller.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -8,8 +9,8 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.Icd10;
-import com.smartor.service.IIcd10Service;
+import com.ruoyi.common.core.domain.entity.Icd10;
+import com.ruoyi.common.core.service.IIcd10Service;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,11 +38,23 @@
*/
@ApiOperation("鏌ヨ鐤剧梾鍒楄〃")
//@PreAuthorize("@ss.hasPermi('system:icd10:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/list")
public TableDataInfo list(@RequestBody Icd10 icd10) {
PageUtils.startPageByPost(icd10.getPageNum(), icd10.getPageSize());
List<Icd10> list = icd10Service.selectIcd10List(icd10);
return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ鐤剧梾鍒楄〃
+ */
+ @ApiOperation("鏌ヨ鐤剧梾鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:icd10:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @GetMapping("/queryAddIcd10")
+ public void queryAddIcd10() {
+ int list = icd10Service.queryAddIcd10();
}
/**
@@ -73,10 +86,9 @@
@ApiOperation("鏂板鐤剧梾")
//@PreAuthorize("@ss.hasPermi('system:icd10:add')")
@Log(title = "鐤剧梾", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody Icd10 icd10) {
- SysUser user = getLoginUser().getUser();
- icd10.setOrgid(user.getOrgid());
return toAjax(icd10Service.insertIcd10(icd10));
}
@@ -86,6 +98,7 @@
@ApiOperation("淇敼鐤剧梾")
//@PreAuthorize("@ss.hasPermi('system:icd10:edit')")
@Log(title = "鐤剧梾", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody Icd10 icd10) {
return toAjax(icd10Service.updateIcd10(icd10));
--
Gitblit v1.9.3