From fe546224146c917c4a9730d3a46c214cd2ceda20 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 30 七月 2026 15:52:36 +0800
Subject: [PATCH] 【市一】AI
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 b4fe522..d858375 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -434,12 +434,6 @@
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
ExternalInDeptPatientInfo externalInDeptPatientInfo = BeanUtil.mapToBean(RuKeXX, ExternalInDeptPatientInfo.class, true);
-
- ExternalInDeptPatientInfo externalJZInfo = BeanUtil.mapToBean(JiuZhenXX, ExternalInDeptPatientInfo.class, true);
- if(ObjectUtils.isNotEmpty(externalJZInfo)){
- externalInHospPatientInfo.setJingGuanYSID(externalJZInfo.getJingGuanYSID());
- externalInHospPatientInfo.setJingGuanYSXM(externalJZInfo.getJingGuanYSXM());
- }
externalInHospPatientInfo.setZeRenHSID(externalInDeptPatientInfo.getZeRenHSID());
externalInHospPatientInfo.setZeRenHSXM(externalInDeptPatientInfo.getZeRenHSXM());
externalInHospPatientInfo.setZhuZhiYSID(externalInDeptPatientInfo.getZhuZhiYSID());
@@ -1210,12 +1204,23 @@
patMedOuthosp.setFuflag("1");
}
}
+ Integer visitTimeNum = null;
+ String visitTimeUnit = "澶�";
for (ExternalWZInfo externalWZInfo : ExternalWZInfoList) {
if (externalWZInfo.getWenZhenLXMC().equals("鐜扮梾鍙�")) {
patMedOuthosp.setHpi(externalWZInfo.getNeiRong());
}
if (externalWZInfo.getWenZhenLXMC().equals("涓昏瘔")) {
patMedOuthosp.setMainsuit(externalWZInfo.getNeiRong());
+ }
+ if (externalWZInfo.getWenZhenLXMC().equals("闅忚澶╂暟")) {
+ String visitTimeNumStr = externalWZInfo.getNeiRong();
+ if(StringUtils.isNotEmpty(visitTimeNumStr) && visitTimeNumStr.matches("^-?\\d+$")){
+ visitTimeNum = Integer.parseInt(visitTimeNumStr);
+ }
+ }
+ if (externalWZInfo.getWenZhenLXMC().equals("闅忚澶╂暟鍗曚綅")) {
+ visitTimeUnit = externalWZInfo.getNeiRong();
}
}
int i = 0;
@@ -1236,6 +1241,11 @@
}
i = patMedOuthospService.insertPatMedOuthosp(patMedOuthosp);
+ }
+ Date adminDate = externalJZInfo.getJiuZhenRQ();
+ //瀹屾垚鎺ヨ瘖 宸茬粡瀹屾垚浠诲姟鍐嶆闅忚
+ if(ObjectUtils.isNotEmpty(visitTimeNum) && ObjectUtils.isNotEmpty(adminDate)){
+ patMedOuthospService.followUpAgainByPatMedOuthosp(patMedOuthosp, adminDate, visitTimeNum);
}
if (i > 0) {
@@ -1447,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());
@@ -1463,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;
--
Gitblit v1.9.3