From 0a10b51863b939e646661394ae7e03acb0cb0039 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 14 四月 2025 19:08:47 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index c2f3ecb..ab37179 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -375,13 +375,20 @@
             if (serviceTask.getSendState() == null) {
                 serviceTask.setSendState(1L);
                 serviceTaskVO.setSendState(1L);
+            }else {
+                serviceTask.setSendState(serviceTaskVO.getSendState());
             }
             if (StringUtils.isNotEmpty(serviceTaskVO.getLibtemplateid())) {
                 serviceTask.setLibtemplateid(serviceTaskVO.getLibtemplateid());
                 serviceTask.setLibtemplatename(serviceTaskVO.getLibtemplatename());
             }
-            serviceTask.setTemplateid(tempid);
-            serviceTask.setTemplatename(tempName);
+            if (serviceTaskVO.getTemplateid() != null) {
+                serviceTask.setTemplateid(serviceTaskVO.getTemplateid());
+                serviceTask.setTemplatename(serviceTaskVO.getTemplatename());
+            } else {
+                serviceTask.setTemplateid(tempid);
+                serviceTask.setTemplatename(tempName);
+            }
             serviceTask.setLeaveldeptcodes(serviceTaskVO.getLeaveldeptcodes());
             serviceTask.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
             serviceTask.setSendState(2L);

--
Gitblit v1.9.3