From 13f9867df6fc7de535670169c190df4ec9012968 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 05 二月 2026 10:56:04 +0800
Subject: [PATCH] 【市一】随访任务发送报错补充remark信息
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
index e41dc06..eb58c9a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
@@ -2,19 +2,24 @@
import java.lang.reflect.Array;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.PageUtils;
+import com.smartor.domain.PatArchiveOthreInfo;
import com.smartor.domain.PatMedReq;
import com.smartor.domain.PatMedRes;
import io.netty.util.internal.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,29 +57,36 @@
* 鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�
*/
//@PreAuthorize("@ss.hasPermi('smartor:patouthosp:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedOuthospList")
@ApiOperation("鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�")
- public TableDataInfo selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
- PageUtils.startPageByPost(patMedOuthosp.getPageNum(), patMedOuthosp.getPageSize());
+ public Map<String, Object> selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
+ patMedOuthosp.setPageNum(PageUtils.getOffset(patMedOuthosp.getPageNum(), patMedOuthosp.getPageSize()));
SysUser user = getLoginUser().getUser();
patMedOuthosp.setOrgid(user.getOrgid());
List<PatMedOuthosp> list = patMedOuthospService.selectPatMedOuthospList(patMedOuthosp);
- return getDataTable(list);
+ patMedOuthosp.setPageNum(null);
+ patMedOuthosp.setPageSize(null);
+ List<PatMedOuthosp> patMedOuthosps = patMedOuthospService.selectPatMedOuthospList(patMedOuthosp);
+ Integer count = 0;
+ if (CollectionUtils.isNotEmpty(patMedOuthosps)) count = patMedOuthosps.size();
+ return getDataTable3(count, list);
}
/**
* 鏌ヨ鎮ｈ�呴棬璇婅褰曞垪琛�
*/
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedOuthospCount")
@ApiOperation("鏌ヨ闂ㄨ瘖鐪嬬梾浜烘鍜屼汉鏁�")
public AjaxResult selectPatMedOuthospCount(@RequestBody PatMedReq patMedReq) {
-// SysUser user = getLoginUser().getUser();
+ SysUser user = getLoginUser().getUser();
// List<String> deptCode = new ArrayList<>();
// for (Map<String, Object> map : user.getBelongDepts()) {
// if (ObjectUtils.isNotEmpty(map.get("deptCode"))) deptCode.add(map.get("deptCode").toString());
// }
// patMedReq.setDeptcodeList(deptCode);
-
+ patMedReq.setOrgid(user.getOrgid());
PatMedRes patMedRes = patMedOuthospService.selectPatMedOuthospCount(patMedReq);
return success(patMedRes);
}
@@ -115,6 +127,7 @@
@ApiOperation("鏂板鎮ｈ�呴棬璇婅褰�")
//@PreAuthorize("@ss.hasPermi('smartor:patouthosp:add')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedOuthosp patMedOuthosp) {
SysUser user = getLoginUser().getUser();
@@ -128,6 +141,7 @@
@ApiOperation("淇敼鎮ｈ�呴棬璇婅褰�")
//@PreAuthorize("@ss.hasPermi('smartor:patouthosp:edit')")
@Log(title = "鎮ｈ�呴棬璇婅褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedOuthosp patMedOuthosp) {
return toAjax(patMedOuthospService.updatePatMedOuthosp(patMedOuthosp));
--
Gitblit v1.9.3