From d9a9b46a9c95cc1fa135fbc333d8d3c216d9e7c1 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 30 七月 2026 14:50:01 +0800
Subject: [PATCH] 【丽水】手术随访调整
---
smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml | 4 +++-
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 9 +++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
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 04e91f6..d858375 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1457,7 +1457,9 @@
Boolean addMianTableFalg = true;
for (ExternalOperationDetail externalOperationDetail : externalOperationDetails) {
PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
- patMedOperationItem.setOpid(patMedOperation.getOpid());
+ if(ObjectUtils.isNotEmpty(patMedOperation.getId())){
+ patMedOperationItem.setOpid(patMedOperation.getId().toString());
+ }
patMedOperationItem.setOpcode(externalOperationDetail.getShouShuMCID());
patMedOperationItem.setOpdesc(externalOperationDetail.getShouShuMC());
patMedOperationItem.setMainFlag(externalOperationDetail.getZhuShouSBZ());
@@ -1473,7 +1475,10 @@
if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {
patMedOperation.setOpcode(externalOperationDetail.getShouShuMCID());
patMedOperation.setOpdesc(externalOperationDetail.getShouShuMC());
-// patMedOperation.setOpid(externalOperationDetail.getShouShuJBDM());
+ if(ObjectUtils.isNotEmpty(patMedOperation.getId())){
+ patMedOperation.setOpid(patMedOperation.getId().toString());
+ }
+
patMedOperation.setUpdateTime(new Date());
patMedOperationMapper.updatePatMedOperation(patMedOperation);
addMianTableFalg = false;
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
index 75bccb7..b856fc2 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -419,10 +419,12 @@
pmo.drcode, pmo.drname, pmo.nurse_id, pmo.nurse_name
from pat_med_operation pmo
join pat_med_operation_item pmoi
- on pmoi.opcode = pmo.opcode
+ on pmoi.opid = pmo.opid
where
pmo.del_flag = '0'
and pmoi.del_flag = '0'
+ and pmo.opid is not null
+ and pmoi.opid is not null
<if test="operationid != null ">
and pmoi.operationid = #{operationid}
</if>
--
Gitblit v1.9.3