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/mapper/ServiceTaskScheduleMapper.java            |    5 +++++
 smartor/src/main/java/com/smartor/service/impl/ServiceTaskScheduleServiceImpl.java |   12 +++++++++---
 smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleDetailMapper.java      |    5 +++++
 smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleDetailMapper.xml      |    5 +++++
 smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml            |    6 ++++++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleDetailMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleDetailMapper.java
index de7eb4d..dc307f4 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleDetailMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleDetailMapper.java
@@ -64,4 +64,9 @@
      * 閫昏緫鍒犻櫎锛堟寜 taskid锛�
      */
     int deleteByTaskid(@Param("taskid") Long taskid);
+
+    /**
+     * 纭垹闄わ紙鎸� taskid锛�
+     */
+    int hardDeleteByTaskid(@Param("taskid") Long taskid);
 }
diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleMapper.java
index 59a4703..fcd42e4 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceTaskScheduleMapper.java
@@ -51,6 +51,11 @@
     int deleteByTaskid(@Param("taskid") Long taskid);
 
     /**
+     * 纭垹闄わ紙鎸� taskid锛夛細淇敼浠诲姟鏃舵竻绌烘棫璁″垝
+     */
+    int hardDeleteByTaskid(@Param("taskid") Long taskid);
+
+    /**
      * 浠诲姟缁勶紙appltype=5锛夋粴鍔ㄨ皟搴︾敤锛氭煡璇㈡墍鏈夋湭杈句笂闄愮殑寰幆璁″垝銆�
      * 鏉′欢锛歴chedule_style=1 涓� (max_loop_count is null or max_loop_count=0 or current_loop_count &lt; max_loop_count)
      * 闄愬埗杩斿洖鏉℃暟閬垮厤闀夸簨鍔°��
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskScheduleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskScheduleServiceImpl.java
index 4f0a035..3084138 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskScheduleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskScheduleServiceImpl.java
@@ -59,9 +59,9 @@
             throw new BaseException("浠诲姟璁″垝鏄庣粏涓嶈兘涓虹┖锛堣嚦灏戜竴鏉� detail锛�");
         }
 
-        // 1. 鏃ц鍒掕蒋鍒�
-        serviceTaskScheduleMapper.deleteByTaskid(vo.getTaskid());
-        serviceTaskScheduleDetailMapper.deleteByTaskid(vo.getTaskid());
+        // 1. 鏃ц鍒掑垹
+        serviceTaskScheduleMapper.hardDeleteByTaskid(vo.getTaskid());
+        serviceTaskScheduleDetailMapper.hardDeleteByTaskid(vo.getTaskid());
 
         // 2. 涓昏鍒掕惤搴�
         Date now = DateUtils.getNowDate();
@@ -78,6 +78,12 @@
         schedule.setNextExecuteTime(vo.getNextExecuteTime());
         schedule.setScheduleBenchmark(vo.getScheduleBenchmark() == null ? 0 : vo.getScheduleBenchmark());
         schedule.setScheduleBenchmarkCustomTime(vo.getScheduleBenchmarkCustomTime());
+
+        schedule.setDeptCodes(vo.getDeptCodes());
+        schedule.setWardCodes(vo.getWardCodes());
+        schedule.setIcd10Codes(vo.getIcd10Codes());
+        schedule.setOplevelCodes(vo.getOplevelCodes());
+
         schedule.setRemark(vo.getRemark());
         schedule.setDelFlag("0");
         schedule.setCreateBy(vo.getCreateBy());
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleDetailMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleDetailMapper.xml
index d75ee96..8d3871a 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleDetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleDetailMapper.xml
@@ -183,4 +183,9 @@
           and del_flag = '0'
     </update>
 
+    <delete id="hardDeleteByTaskid" parameterType="Long">
+        delete from service_task_schedule_detail
+        where taskid = #{taskid}
+          and del_flag = '0'
+    </delete>
 </mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
index a8980a6..c21a7ad 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskScheduleMapper.xml
@@ -186,6 +186,12 @@
           and del_flag = '0'
     </update>
 
+    <delete id="hardDeleteByTaskid" parameterType="Long">
+        delete from service_task_schedule
+        where del_flag = '0'
+        and taskid = #{taskid}
+    </delete>
+
     <select id="selectActiveCycleSchedules" resultMap="ServiceTaskScheduleResult">
         <include refid="selectServiceTaskScheduleVo"/>
         where del_flag = '0'

--
Gitblit v1.9.3