From 25c9ca5313fbed298f1faf3893b7b0c780b6e1b2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 03 九月 2026 16:33:02 +0800
Subject: [PATCH] 【丽水】手术撤销
---
smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml | 8 ++++++++
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 3 ++-
smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java | 8 ++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
index fdab6ef..9148404 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
@@ -77,6 +77,14 @@
public int deleteHardPatMedOperationItemByOpId(String opid);
/**
+ * 鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰曞瓙
+ *
+ * @param opid 鎮ｈ�呮鏌ユ楠岃褰曞瓙涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteSoftPatMedOperationItemByOpId(String opid);
+
+ /**
* 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞瓙鍒楄〃
*
* @param patMedOperationItem 鎮ｈ�呮鏌ユ楠岃褰曞瓙
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 797b55e..e7c2dc4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1570,7 +1570,7 @@
serviceSubtaskVO.setPatid(patArchive.getId());
serviceSubtaskVO.setSendstates(sendstates);
serviceSubtaskVO.setOperationItemIds(operationItemIds);
- serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
//鍘籸edis涓紝鏌ヨ鏄惁鏈塻ubid锛屾湁鐨勮瘽绉婚櫎cache-exist
if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -1588,6 +1588,7 @@
}
operation.setUpdateTime(new Date());
patMedOperationMapper.updatePatMedOperation(operation);
+ patMedOperationItemMapper.deleteSoftPatMedOperationItemByOpId(operation.getOpid());
}
}
}
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
index 6fe3025..ec8da0d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -444,6 +444,14 @@
where opid = #{opid}
</delete>
+ <update id="deleteSoftPatMedOperationItemByOpId" parameterType="String">
+ update pat_med_operation_item
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1
+ </trim>
+ where opid = #{opid}
+ </update>
+
<select id="selectOperationItemList" parameterType="com.smartor.domain.PatMedOperationItem"
resultMap="PatMedOperationItemResult">
select pmoi.id, pmoi.operationid, pmoi.opid, pmoi.opcode, pmoi.opdesc, pmoi.main_flag, pmoi.incitypecode,
--
Gitblit v1.9.3