From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskscheduleController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..273095e 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
@@ -66,7 +66,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 +76,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 +98,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