From 9f9e9be084ea03f7b7eb301f2f6e201c6c2589d7 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 05 八月 2026 17:10:31 +0800
Subject: [PATCH] 【景宁】手术随访增加出院科室、病区限制
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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 382ef76..9276652 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1,8 +1,6 @@
package com.smartor.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONUtil;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.ruoyi.common.core.domain.entity.SysDept;
@@ -10,8 +8,6 @@
import com.ruoyi.common.core.domain.entity.SysUserDept;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.AesUtils;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
@@ -21,7 +17,6 @@
import com.smartor.service.IPatMedOuthospService;
import com.smartor.service.IServiceExternalService;
import lombok.extern.slf4j.Slf4j;
-import netscape.javascript.JSObject;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +25,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -441,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());
@@ -1217,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;
@@ -1243,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) {
@@ -1332,7 +1335,6 @@
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
-
PatArchive patArchive = addPatArchive(externalInHospPatientInfo, null, null);
@@ -1353,6 +1355,10 @@
patMedOperation.setPatid(patArchive.getId());
patMedOperation.setPatcode(externalInHospPatientInfo.getBingRenID());
patMedOperation.setPaname(externalInHospPatientInfo.getXingMing());
+ patMedOperation.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID());
+ patMedOperation.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC());
+ patMedOperation.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID());
+ patMedOperation.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
patMedOperation.setOpreqcode(externalOperationInfo.getShenQingDID());
//鏌ヨ涓�涓嬶紝璇ユ偅鑰呮槸鍚﹀凡缁忔湁杩欎簺鏁版嵁
List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
@@ -1454,7 +1460,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());
@@ -1470,7 +1478,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