From efaa2a7a5b7d9d1a36f4d6a7e275d2b76f6cd9d3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 06 八月 2026 18:06:09 +0800
Subject: [PATCH] 【景宁】查询随访任务组科室关联列表、查询随访任务组疾病关联列表

---
 smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index ad67157..29181f7 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -164,23 +164,23 @@
             patArchiveVO.setIsoperation(2);
             patArchiveMapper.updatePatArchive(patArchive);
             if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
-                //涓嶉渶瑕佹湇鍔′簡锛岄渶瑕侀�氳繃patid鍜宻endstate=2鎴栬�卻endstate=1鍘绘煡璇竴涓嬶紝service_subtask閲屾槸鍚︽湁姝e湪鎵ц鐨勪换鍔★紝鏈夌殑璇濓紝绔嬪嵆鍋滀簡
+                //涓嶉渶瑕佹湇鍔′簡锛岄渶瑕侀�氳繃patid鍜宻endstate=1,2,3,5,7鍘绘煡璇竴涓嬶紝service_subtask閲屾槸鍚︽湁姝e湪鎵ц鐨勪换鍔★紝鏈夌殑璇濓紝绔嬪嵆鍋滀簡
+                List<Long> list = Arrays.asList(1L, 2L, 3L, 5L, 7L);
+                List<ServiceSubtask> serviceSubtaskList = new ArrayList<>();
                 ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
                 serviceSubtaskVO.setPatid(patArchive.getId());
-                serviceSubtaskVO.setSendstate(2L);
-                List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
-                serviceSubtaskVO.setSendstate(1L);
-                List<ServiceSubtask> serviceSubtaskList1 = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
-                if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
-                    if (CollectionUtils.isNotEmpty(serviceSubtaskList1)) serviceSubtaskList.addAll(serviceSubtaskList1);
-                } else {
-                    if (CollectionUtils.isNotEmpty(serviceSubtaskList1)) serviceSubtaskList = serviceSubtaskList1;
+                for (Long ss : list) {
+                    serviceSubtaskVO.setSendstate(ss);
+                    List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+                    serviceSubtaskList.addAll(serviceSubtasks);
                 }
                 //鍘籸edis涓紝鏌ヨ鏄惁鏈塻ubid锛屾湁鐨勮瘽绉婚櫎cache-exist
                 if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
                     for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
                         log.info("闇�瑕佺Щ闄ょ殑subId涓猴細{}", serviceSubtask.getId().toString());
-                        serviceSubtaskMapper.deleteServiceSubtaskById(serviceSubtask.getId());
+                        serviceSubtask.setSendstate(4L);
+                        serviceSubtask.setRemark(patArchiveVO.getNotrequiredreason());
+                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                         redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString());
                         redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString());
                         redisCache.removeElementFromList("cache-1", serviceSubtask.getId().toString());

--
Gitblit v1.9.3