From d9a919279d92fdbb25591b56ad0f746c5609e5a7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 06 三月 2025 16:41:45 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index dc23fbb..ff10844 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -172,7 +172,7 @@
                 patTaskRelevance.setSfzh(serviceSubtask1.getSfzh());
                 patTaskRelevance.setPhone(serviceSubtask1.getPhone());
                 patTaskRelevance.setAddr(serviceSubtask1.getAddr());
-                patTaskRelevance.setDiagname(serviceSubtask1.getDiagname());
+                patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname());
                 patTaskRelevance.setPatid(serviceSubtask1.getPatid());
                 patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate());
                 patTaskRelevances.add(patTaskRelevance);
@@ -186,7 +186,7 @@
                 patTaskRelevance.setAddr(serviceSubtask1.getAddr());
                 patTaskRelevance.setDeptName(serviceSubtask1.getDeptname());
                 patTaskRelevance.setBedNo(serviceSubtask1.getBedNo());
-                patTaskRelevance.setDiagname(serviceSubtask1.getDiagname());
+                patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname());
                 patTaskRelevance.setPatid(serviceSubtask1.getPatid());
                 patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate());
                 patTaskRelevances.add(patTaskRelevance);
@@ -256,13 +256,17 @@
         serviceSubtask.setRoomno(serviceTaskVO.getRoomno());
         serviceSubtask.setBedNo(serviceTaskVO.getBedno());
         serviceSubtask.setDeptname(serviceTaskVO.getDeptname());
+        serviceSubtask.setDeptcode(serviceTaskVO.getDeptcode());
         serviceSubtask.setSendstate(1L);
         serviceSubtask.setCreateTime(new Date());
+        serviceSubtask.setLeavehospitaldistrictcode(serviceTaskVO.getDistrictcode());
         //鍏堟煡璇竴閬嶏紝璇askGuid鏄惁瀛樺湪
         ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
         serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
         List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
         if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
+            serviceSubtask.setId(serviceSubtaskList.get(0).getId());
+            serviceSubtask.setUpdateTime(new Date());
             serviceSubtaskMapper.updateServiceSubtaskByTaskGuid(serviceSubtask);
         } else {
             serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -296,7 +300,6 @@
         List<BaseOrganization> baseOrganizations = baseOrganizationMapper.selectBaseOrganizationList(baseOrganization);
         if (CollectionUtils.isNotEmpty(baseOrganizations)) {
             YongHuXX yongHuXX = serviceQueryInfo.getYeWuXX().getYongHuXX();
-            yongHuXX.setYongHuID(baseOrganizations.get(0).getOrgid());
             yongHuXX.setZuZhiJGID(baseOrganizations.get(0).getGuid());
             yongHuXX.setZuZhiJGMC(baseOrganizations.get(0).getOrganizationName());
             serviceQueryInfo.getYeWuXX().setYongHuXX(yongHuXX);

--
Gitblit v1.9.3