From a0e46d75fd50924c8e9ac0cf24a8daa0471bbed2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 19 二月 2025 10:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 7 ++++---
1 files changed, 4 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 305e581..b57b366 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);
@@ -234,6 +234,7 @@
serviceSubtask.setEndtime(serviceTaskVO.getFinishtime());
serviceSubtask.setResult(serviceTaskVO.getResult());
serviceSubtask.setSuggest(serviceTaskVO.getSuggest());
+ serviceSubtask.setDelFlag(serviceTaskVO.getDelflag());
serviceSubtask.setOrgid(serviceTaskVO.getOrgguid());
serviceSubtask.setPatid(serviceTaskVO.getPatguid());
serviceSubtask.setSendname(serviceTaskVO.getPatname());
@@ -259,7 +260,7 @@
serviceSubtask.setCreateTime(new Date());
//鍏堟煡璇竴閬嶏紝璇askGuid鏄惁瀛樺湪
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
- serviceSubtaskVO.setTaskGuid(serviceTaskVO.getGuid());
+ serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
serviceSubtaskMapper.updateServiceSubtaskByTaskGuid(serviceSubtask);
--
Gitblit v1.9.3