From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskscheduleController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskscheduleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskscheduleController.java
index f8cd47c..4bd1944 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskscheduleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskscheduleController.java
@@ -10,12 +10,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
-import com.smartor.domain.Icd10;
-import com.smartor.domain.ServiceTaskSchedule;
-import com.smartor.domain.ServiceTaskdiag;
-import com.smartor.service.IIcd10Service;
-import com.smartor.service.IServiceTaskScheduleService;
-import com.smartor.service.IServiceTaskdiagService;
+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.apache.commons.collections4.CollectionUtils;
@@ -30,6 +26,8 @@
import java.util.Map;
import static com.alibaba.fastjson2.JSONValidator.Type.Array;
+import com.ruoyi.task.domain.ServiceTaskSchedule;
+import com.ruoyi.task.service.IServiceTaskScheduleService;
/**
* 闅忚浠诲姟缁勫叧鑱擟ontroller
@@ -66,7 +64,8 @@
SysDept sysDept = new SysDept();
sysDept.setOrgid(schedule.getOrgid());
sysDept.setDeptType("1");
- sysDept.setDeptCodes(Arrays.asList(split));
+ sysDept.setDeptCodes(new ArrayList<>(Arrays.asList(split)));
+
list = sysDeptService.selectDeptList(sysDept);
}
@@ -75,7 +74,7 @@
SysDept sysDept = new SysDept();
sysDept.setOrgid(schedule.getOrgid());
sysDept.setDeptType("2");
- sysDept.setDeptCodes(Arrays.asList(split));
+ sysDept.setDeptCodes(new ArrayList<>(Arrays.asList(split)));
list = sysDeptService.selectDeptList(sysDept);
}
}
@@ -97,7 +96,7 @@
if(ObjectUtils.isNotEmpty(schedule) && StringUtils.isNotEmpty(schedule.getIcd10Codes())){
Icd10 icd10 = new Icd10();
String[] split = schedule.getIcd10Codes().split(",");
- icd10.setIcdcodes(Arrays.asList(split));
+ icd10.setIcdcodes(new ArrayList<>(Arrays.asList(split)));
icd10.setOrgid(schedule.getOrgid());
list = icd10Service.selectIcd10List(icd10);
}
--
Gitblit v1.9.3