From 7518413aeb91ea9b9dd80c7a5d51057ff616a8f1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 13 五月 2026 14:53:13 +0800
Subject: [PATCH] 补偿问题处理提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 b731d40..d34e294 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -643,6 +643,13 @@
                     if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
                     serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
                     serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
+                    serviceTaskdiag.setGuid(serviceTask.getGuid());
+                    serviceTaskdiag.setOrgid(serviceTask.getOrgid());
+                    serviceTaskdiag.setCreateTime(new Date());
+                    serviceTaskdiag.setDeptCode(serviceTaskVO.getDeptcode());
+                    serviceTaskdiag.setDeptName(serviceTaskVO.getDeptname());
+                    serviceTaskdiag.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
+                    serviceTaskdiag.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
                     //鍗楀崕闄勪竴鐨刬cd10code鏄湁閲嶅鐨勶紝鎵�浠ヤ笉鑳界敤鍗楀崕闄勪竴鐨刬cd10code鍘绘煡璇�
                     if (!active.equals("nhfy") && StringUtils.isEmpty(serviceTaskVO.getIcd10name())) {
                         Icd10 icd10 = new Icd10();
@@ -651,9 +658,7 @@
                         if (CollectionUtils.isNotEmpty(icd10s))
                             serviceTaskdiag.setIcd10name(icd10s.get(0).getIcdname());
                     }
-                    serviceTaskdiag.setGuid(serviceTask.getGuid());
-                    serviceTaskdiag.setOrgid(serviceTask.getOrgid());
-                    serviceTaskdiag.setCreateTime(new Date());
+
                     log.info("----serviceTaskdiag鐨勫�间负锛歿}", serviceTaskdiag);
                     if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
                         String[] Icd10codes = serviceTaskVO.getIcd10code().split(",");
@@ -877,6 +882,10 @@
                     serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
                     serviceTaskdiag.setGuid(serviceTask.getGuid());
                     serviceTaskdiag.setOrgid(serviceTask.getOrgid());
+                    serviceTaskdiag.setDeptCode(serviceTaskVO.getDeptcode());
+                    serviceTaskdiag.setDeptName(serviceTaskVO.getDeptname());
+                    serviceTaskdiag.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
+                    serviceTaskdiag.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
                     serviceTaskdiag.setUpdateTime(new Date());
                     if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
                         String[] icd10codes = serviceTaskVO.getIcd10code().split(",");

--
Gitblit v1.9.3