From 4cccaf33dd171c20b6c262467f24706e3d175aab Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 二月 2025 18:15:09 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 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 09fcb1a..30ea393 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -395,6 +395,9 @@
Map<String, Object> BingRenXX = (Map<String, Object>) yeWuXX.get("BingRenXX");
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, null, null);
+
+
//鎵嬫湳淇℃伅鏂板
Map<String, Object> ssxx = (Map<String, Object>) yeWuXX.get("ShouShuSQ");
//鎵嬫湳鏇存柊
@@ -409,7 +412,7 @@
else if (ObjectUtils.isNotEmpty(sscx))
externalOperationInfo = BeanUtil.mapToBean(sscx, ExternalOperationInfo.class, true);
PatMedOperation patMedOperation = new PatMedOperation();
- patMedOperation.setPatid(null);
+ patMedOperation.setPatid(patArchive.getId());
patMedOperation.setPatcode(externalInHospPatientInfo.getBingRenID());
patMedOperation.setPaname(externalInHospPatientInfo.getXingMing());
// patMedOperation.setOpreqid(externalOperationInfo.getShenQingDID());
@@ -418,8 +421,8 @@
List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
patMedOperation.setOpsstatus(null);
- patMedOperation.setOperationcode(externalOperationInfo.getShouShuLBDM());
- patMedOperation.setOperationname(externalOperationInfo.getShouShuLBMC());
+ patMedOperation.setOptypecode(externalOperationInfo.getShouShuLBDM());
+ patMedOperation.setOptypename(externalOperationInfo.getShouShuLBMC());
patMedOperation.setOperatortime(externalOperationInfo.getYaoQiuSJ());
patMedOperation.setOpreqtime(externalOperationInfo.getShenQingSJ());
patMedOperation.setReqdoccode(externalOperationInfo.getShenQingYSID());
@@ -470,6 +473,12 @@
if (CollectionUtils.isNotEmpty(patMedOperations)) {
Long id = patMedOperations.get(0).getId();
patMedOperation.setId(id);
+ patMedOperation.setCheckFlag(patMedOperations.get(0).getCheckFlag());
+ //濡傛灉鎵嬫湳鎾ら攢锛岀洿鎺ュ垹闄よ鏉℃墜鏈俊鎭�
+ if (ObjectUtils.isNotEmpty(sscx)) {
+ patMedOperation.setDelFlag("1");
+ //鍚屾椂鍘绘煡璇紝鏄惁鍦╯ubtask涓敓鎴愪换鍔★紝濡傛灉鐢熸垚鍑哄緱绔嬮┈鍒犻櫎
+ }
patMedOperationMapper.updatePatMedOperation(patMedOperation);
} else patMedOperationMapper.insertPatMedOperation(patMedOperation);
log.error("-----patMedOperation鐨勪富閿甶d涓猴細{}", patMedOperation.getId());
@@ -477,6 +486,8 @@
if (ObjectUtils.isNotEmpty(ssxx)) {
Map<String, Object> ShouShuMXList = (Map<String, Object>) ssxx.get("ShouShuMXList");
List<ExternalOperationDetail> externalOperationDetails = BeanUtil.mapToBean(ShouShuMXList, List.class, true);
+ //addMianTableFalg鏄惁闇�瑕佸皢涓绘墜鏈殑淇℃伅鏀惧埌PatMedOperation琛ㄤ腑锛堝彧鏈夌涓�涓富鎵嬫湳淇℃伅闇�瑕佹斁锛屽悗闈㈢殑閮戒笉闇�瑕佹斁浜嗭紝涔熷氨鏄锛岀涓�涓斁瀹屽悗锛屽氨瑕佹妸杩欎釜flag鏀规垚false锛�
+ Boolean addMianTableFalg = true;
for (ExternalOperationDetail externalOperationDetail : externalOperationDetails) {
PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
patMedOperationItem.setOpid(patMedOperation.getId());
@@ -490,6 +501,14 @@
patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW());
patMedOperationItem.setDelFlag("0");
patMedOperationItem.setOrgid(patMedOperation.getOrgid());
+ if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {
+ patMedOperation.setOpcode(externalOperationDetail.getShouShuMCID());
+ patMedOperation.setOpdesc(externalOperationDetail.getShouShuMC());
+// patMedOperation.setOpid(externalOperationDetail.getShouShuJBDM());
+ patMedOperationMapper.updatePatMedOperation(patMedOperation);
+ addMianTableFalg = false;
+ }
+
patMedOperationItemMapper.insertPatMedOperationItem(patMedOperationItem);
}
}
--
Gitblit v1.9.3