From d1995068ddc93414e01a02bd0a21626a4a6ad9a4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 27 十月 2026 18:20:34 +0800
Subject: [PATCH] 【丽水】1、新增接口 \smartor\doc\api\dealIcd10Subtask 2、/smartor/serviceSubtask/addSubTaskAgain 随访方式控制                                               随访是走中心科室还是本科室 3、/smartor/serviceSubtask/addSubTaskAgain 未配置nexttaskid的默认取自己的taskid

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java
index 6d90b67..594e89e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicationItemController.java
@@ -6,6 +6,7 @@
 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.PageUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.MedicationItem;
 import com.smartor.service.IMedicationItemService;
@@ -16,6 +17,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鑽搧淇℃伅Controller
@@ -37,10 +39,13 @@
     //@PreAuthorize("@ss.hasPermi('smartor:item:list')")
     @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
     @PostMapping("/list")
-    public TableDataInfo list(@RequestBody MedicationItem medicationItem) {
-        startPage();
+    public Map<String, Object> list(@RequestBody MedicationItem medicationItem) {
+        medicationItem.setPageNum(PageUtils.getOffset(medicationItem.getPageNum(), medicationItem.getPageSize()));
         List<MedicationItem> list = medicationItemService.selectMedicationItemList(medicationItem);
-        return getDataTable(list);
+        medicationItem.setPageNum(null);
+        medicationItem.setPageSize(null);
+        List<MedicationItem> total = medicationItemService.selectMedicationItemList(medicationItem);
+        return getDataTable3(total.size(), list);
     }
 
     /**

--
Gitblit v1.9.3