From 56e76b12172aa483ea15792028137a38fba71755 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 05 二月 2026 14:37:27 +0800
Subject: [PATCH] 【丽水】报错处理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 2a5ff0d..5b29054 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -22,6 +22,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.mapper.PatMedInhospMapper;
@@ -487,6 +488,13 @@
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖");
}
+ String followUpCountStyle = configService.selectConfigByKey("followUpCountStyle",
+ serviceSubtaskCountReq.getOrgid());
+ if (ObjectUtils.isNotEmpty(followUpCountStyle)){
+ serviceSubtaskCountReq.setFollowUpCountStyle(followUpCountStyle);
+ }else {
+ serviceSubtaskCountReq.setFollowUpCountStyle("1");
+ }
return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
}
@@ -586,7 +594,6 @@
if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() == 0 && serviceSubtaskCountReq.getDeptcodes().size() == 0) {
return error("绉戝鎴栫梾鍖轰笉鑳戒负绌�");
}
- PageUtils.startPageByPost(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
//澶嶈瘖缁熻
String configKey = serviceSubtaskCountReq.getConfigKey();
if (StringUtils.isNotEmpty(configKey)) {
@@ -606,6 +613,7 @@
LoginUser loginUser = getLoginUser();
String orgid = loginUser.getUser().getOrgid();
serviceSubtaskCountReq.setOrgid(orgid);
+ PageUtils.startPageByPost(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
return success(serviceSubtaskService.getSfStatisticsScriptDetails(serviceSubtaskCountReq));
}
--
Gitblit v1.9.3