From 254932f503b41e246e88d76e33d1a9b860597630 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 26 十月 2026 16:27:03 +0800
Subject: [PATCH] 【丽水】JC_BG_BaoGao 同步报错问题处理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java | 22 ++++-
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 193 ++++++++++++++++++++++++++++++++++++++---------
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 6 +
3 files changed, 177 insertions(+), 44 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
index eb956a2..2d70b4d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.service.IServiceExternalService;
@@ -50,8 +51,7 @@
try {
aBoolean = serviceExternalService.generalInterface(dataMap);
} catch (Exception e) {
- e.printStackTrace();
- log.error("serviceExternal---generalInterface鍑哄紓甯镐簡锛歿}", e.getMessage());
+ log.error("serviceExternal---generalInterface鍑哄紓甯镐簡锛歿}", e.getMessage(), e);
aBoolean = false;
}
return returnParam(aBoolean, dataMap);
@@ -365,8 +365,7 @@
try {
aBoolean = serviceExternalService.addInspectBGService(dataMap);
} catch (Exception e) {
- e.printStackTrace();
- log.error("serviceExternal---addInspectBGService锛歿}", e.getMessage());
+ log.error("serviceExternal---addInspectBGService锛歿}", e.getMessage(), e);
aBoolean = false;
}
return returnParam(aBoolean, dataMap);
@@ -390,8 +389,19 @@
private Map<String, Object> returnParam(Boolean b, Map dataMap) {
- Map yeWuXX = (Map) dataMap.get("YeWuXX");
- String XiaoXiID = (String) yeWuXX.get("XiaoXiID");
+ String XiaoXiID = null;
+ if (dataMap != null) {
+ Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ if (yeWuXX != null && yeWuXX.get("XiaoXiID") != null) {
+ XiaoXiID = yeWuXX.get("XiaoXiID").toString();
+ }
+ if (StringUtils.isBlank(XiaoXiID)) {
+ Map xiaoXiTou = (Map) dataMap.get("XiaoXiTou");
+ if (xiaoXiTou != null && xiaoXiTou.get("XiaoXiID") != null) {
+ XiaoXiID = xiaoXiTou.get("XiaoXiID").toString();
+ }
+ }
+ }
Map<String, Object> map = new HashMap<>();
if (b) {
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 f672d26..0ae7652 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1999,77 +1999,194 @@
}
//妫�鏌ヨ鎯呮坊鍔�
+ @SuppressWarnings("unchecked")
@Override
+ @Transactional(rollbackFor = Exception.class)
public Boolean addInspectBGService(Map dataMap) {
log.info("ServiceExternalServiceImpl---addInspectBGService鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map xiaoXiTou = (Map) dataMap.get("XiaoXiTou");
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
Map<String, Object> JianChaBG = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaBG") : null;
- List<HashMap<String, Object>> JianChaBWList = ObjectUtils.isNotEmpty(JianChaBG) ? (List<HashMap<String, Object>>) JianChaBG.get("JianChaBWList") : null;
+ if (ObjectUtils.isEmpty(BingRenXX)) {
+ throw new BaseException("妫�鏌ユ姤鍛婂悓姝ュけ璐ワ細BingRenXX涓嶈兘涓虹┖");
+ }
+ if (ObjectUtils.isEmpty(JianChaBG)) {
+ throw new BaseException("妫�鏌ユ姤鍛婂悓姝ュけ璐ワ細JianChaBG涓嶈兘涓虹┖");
+ }
+
+ // 鏈烘瀯浼樺厛鍙栨秷鎭ご锛屽叾娆″彇鎮ｈ�呬俊鎭紝鍜屾鏌ョ敵璇疯ˉ寤洪�昏緫淇濇寔涓�鑷�
+ String orgid = ObjectUtils.isNotEmpty(xiaoXiTou) ? getMapValue(xiaoXiTou, "FaSongJGID") : null;
+ if (StringUtils.isBlank(orgid)) {
+ orgid = getMapValue(BingRenXX, "ZuZhiJGID");
+ }
+ String bingAnHao = getMapValue(BingRenXX, "BingAnHao");
+ String bingRenID = getMapValue(BingRenXX, "BingRenID");
+ String xingMing = getMapValue(BingRenXX, "XingMing");
+ String shenQingDID = getMapValue(JianChaBG, "ShenQingDID");
+ if (StringUtils.isBlank(orgid) || StringUtils.isBlank(bingAnHao) || StringUtils.isBlank(bingRenID)
+ || StringUtils.isBlank(xingMing) || StringUtils.isBlank(shenQingDID)) {
+ throw new BaseException("妫�鏌ユ姤鍛婂悓姝ュけ璐ワ細BingRenXX.ZuZhiJGID/BingAnHao/BingRenID/XingMing銆丣ianChaBG.ShenQingDID涓嶈兘涓虹┖");
+ }
+
PatMedInspection patMedInspection = new PatMedInspection();
PatMedInspectionItem patMedInspectionItem = new PatMedInspectionItem();
- patMedInspection.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
+ patMedInspection.setOrgid(orgid);
//涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
patMedInspection.setCampusid("1");
- patMedInspection.setInhospno(BingRenXX.get("BingAnHao").toString());
- patMedInspection.setPatidHis(BingRenXX.get("BingRenID").toString());
- patMedInspection.setPatname(BingRenXX.get("XingMing").toString());
- patMedInspection.setAppliyid(JianChaBG.get("ShenQingDID").toString());
+ patMedInspection.setInhospno(bingAnHao);
+ patMedInspection.setPatidHis(bingRenID);
+ patMedInspection.setPatname(xingMing);
+ patMedInspection.setAppliyid(shenQingDID);
//鏌ユ壘鎮ｈ�呮鏌ユ楠屼俊鎭紝濡傛灉鏃狅紝杩涜鏂板姞
List<PatMedInspection> patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
- if (CollectionUtils.isNotEmpty(patMedInspections)) {
- patMedInspectionItem.setInspectionid(patMedInspections.get(0).getId().intValue());
- } else {
+ if (CollectionUtils.isEmpty(patMedInspections)) {
addInspectService(dataMap);
- List<PatMedInspection> patMedInspections2 = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
- patMedInspectionItem.setInspectionid(patMedInspections2.get(0).getId().intValue());
+ patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
+ if (CollectionUtils.isEmpty(patMedInspections)) {
+ throw new BaseException("妫�鏌ユ姤鍛婂悓姝ュけ璐ワ細鏈壘鍒版垨鍒涘缓妫�鏌ヤ富璁板綍锛孲henQingDID=" + shenQingDID);
+ }
}
+ patMedInspectionItem.setInspectionid(patMedInspections.get(0).getId().intValue());
//妫�鏌ユ楠屾姤鍛婃暟鎹鐞�
- patMedInspectionItem.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
+ patMedInspectionItem.setOrgid(orgid);
//涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
patMedInspectionItem.setCampusid("1");
List<PatMedInspectionItem> patMedInspectionItems = patMedInspectionItemMapper.selectPatMedInspectionItemList(patMedInspectionItem);
- if (ObjectUtils.isNotEmpty(JianChaBG)) {
- patMedInspectionItem.setInspectionName(JianChaBG.get("JianChaHao").toString());
- patMedInspectionItem.setReportid(JianChaBG.get("JianChaHao").toString());
- patMedInspectionItem.setStatuscode(JianChaBG.get("DangQianZTDM").toString());
- patMedInspectionItem.setStatusname(JianChaBG.get("DangQianZTMC").toString());
- patMedInspectionItem.setReportid(JianChaBG.get("BaoGaoRID").toString());
- patMedInspectionItem.setReportername(JianChaBG.get("BaoGaoRXM").toString());
- patMedInspectionItem.setDiagimpression(JianChaBG.get("ZhenDuanYX").toString());
- patMedInspectionItem.setDiagfindings(JianChaBG.get("ZhenDuanSJ").toString());
- patMedInspectionItem.setDiagsuggestion(JianChaBG.get("ZhenDuanJY").toString());
- patMedInspectionItem.setReporturl(JianChaBG.get("BaoGaoYXDZ").toString());
- patMedInspectionItem.setCriticalFlag(Integer.valueOf(JianChaBG.get("WeiJiZBZ").toString()));
- patMedInspectionItem.setCriticalContent(JianChaBG.get("WeiJiZNR").toString());
- patMedInspectionItem.setReportdeptid(JianChaBG.get("BaoGaoKSID").toString());
- patMedInspectionItem.setReportdeptname(JianChaBG.get("BaoGaoKSMC").toString());
- patMedInspectionItem.setResultcode(JianChaBG.get("JianChaJGDM").toString());
- patMedInspectionItem.setResultname(JianChaBG.get("JianChaJGMC").toString());
- if (ObjectUtils.isNotEmpty(JianChaBG.get("BaoGaoSJ"))) {
- try {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- patMedInspection.setOpendate(simpleDateFormat.parse(JianChaBG.get("BaoGaoSJ").toString()));
- } catch (ParseException e) {
- e.printStackTrace();
+
+ // 鍏煎 PACS 瀹為檯鎶ユ枃锛氭姤鍛婁汉銆佹姤鍛婃椂闂淬�佹姤鍛婂湴鍧�绛夊瓧娈靛悕涓庢爣鍑嗘姤鏂囧瓨鍦ㄥ樊寮�
+ String jianChaHao = getMapValue(JianChaBG, "JianChaHao");
+ String reportId = getMapValue(JianChaBG, "BaoGaoID");
+ if (StringUtils.isBlank(reportId)) {
+ reportId = getMapValue(JianChaBG, "BaoGaoRID");
+ }
+ if (StringUtils.isBlank(reportId)) {
+ reportId = jianChaHao;
+ }
+ String inspectionName = StringUtils.isNotBlank(jianChaHao) ? jianChaHao : reportId;
+ if (StringUtils.isBlank(inspectionName)) {
+ inspectionName = shenQingDID;
+ }
+ String reporterId = getMapValue(JianChaBG, "BaoGaoRID", "ZhiXingRID", "KaiDanRID");
+ String reporterName = getMapValue(JianChaBG, "BaoGaoRXM", "ZhiXingRXM", "KaiDanRXM");
+ String reportUrl = getMapValue(JianChaBG, "BaoGaoYXDZ", "TuWenBGXZDZ", "PDFurl");
+ String reportDateStr = getMapValue(JianChaBG, "BaoGaoSJ", "ZhiXingSJ");
+
+ patMedInspectionItem.setInspectionName(inspectionName);
+ patMedInspectionItem.setReportid(reportId);
+ patMedInspectionItem.setStatuscode(getMapValue(JianChaBG, "DangQianZTDM"));
+ patMedInspectionItem.setStatusname(getMapValue(JianChaBG, "DangQianZTMC"));
+ patMedInspectionItem.setReporterid(reporterId);
+ patMedInspectionItem.setReportername(reporterName);
+ patMedInspectionItem.setDiagimpression(getMapValue(JianChaBG, "ZhenDuanYX"));
+ patMedInspectionItem.setDiagfindings(getMapValue(JianChaBG, "ZhenDuanSJ"));
+ patMedInspectionItem.setDiagsuggestion(getMapValue(JianChaBG, "ZhenDuanJY"));
+ patMedInspectionItem.setReporturl(reportUrl);
+ patMedInspectionItem.setCriticalFlag(parseInteger(getMapValue(JianChaBG, "WeiJiZBZ")));
+ patMedInspectionItem.setCriticalContent(getMapValue(JianChaBG, "WeiJiZNR"));
+ patMedInspectionItem.setReportdeptid(getMapValue(JianChaBG, "BaoGaoKSID"));
+ patMedInspectionItem.setReportdeptname(getMapValue(JianChaBG, "BaoGaoKSMC"));
+ patMedInspectionItem.setResultcode(getMapValue(JianChaBG, "JianChaJGDM"));
+ patMedInspectionItem.setResultname(getMapValue(JianChaBG, "JianChaJGMC"));
+ Date reportDate = parseDateTime(reportDateStr);
+ if (reportDate != null) {
+ patMedInspectionItem.setReportdate(reportDate);
+ }
+
+ // 鍚屼竴妫�鏌ヤ笅鍙兘瀛樺湪澶氭潯鎶ュ憡鏄庣粏锛屼紭鍏堟寜鎶ュ憡ID銆佹鏌ュ彿鍖归厤锛岄伩鍏嶆洿鏂伴敊琛�
+ PatMedInspectionItem existingItem = null;
+ if (CollectionUtils.isNotEmpty(patMedInspectionItems)) {
+ for (PatMedInspectionItem item : patMedInspectionItems) {
+ if (StringUtils.isNotBlank(reportId) && reportId.equals(item.getReportid())) {
+ existingItem = item;
+ break;
}
}
+ if (existingItem == null) {
+ for (PatMedInspectionItem item : patMedInspectionItems) {
+ if (StringUtils.isNotBlank(inspectionName) && inspectionName.equals(item.getInspectionName())) {
+ existingItem = item;
+ break;
+ }
+ }
+ }
+ if (existingItem == null) {
+ existingItem = patMedInspectionItems.get(0);
+ }
}
- if (ObjectUtils.isNotEmpty(patMedInspectionItems)) {
+
+ if (existingItem != null) {
+ // 鏇存柊蹇呴』甯︿笂涓婚敭锛屽惁鍒� update ... where id = null 浼氬奖鍝� 0 琛岋紝鎺ュ彛杩斿洖澶辫触
+ patMedInspectionItem.setId(existingItem.getId());
patMedInspectionItem.setUpdateTime(new Date());
int i = patMedInspectionItemMapper.updatePatMedInspectionItem(patMedInspectionItem);
- if (i != 1) return false;
+ if (i < 1) {
+ throw new BaseException("妫�鏌ユ姤鍛婃槑缁嗘洿鏂板け璐ワ紝id=" + existingItem.getId());
+ }
} else {
patMedInspectionItem.setDelFlag("0");
patMedInspectionItem.setCreateTime(new Date());
int i = patMedInspectionItemMapper.insertPatMedInspectionItem(patMedInspectionItem);
- if (i != 1) return false;
+ if (i != 1) {
+ throw new BaseException("妫�鏌ユ姤鍛婃槑缁嗘柊澧炲け璐ワ紝ShenQingDID=" + shenQingDID);
+ }
}
return true;
}
+ /**
+ * 浠庢姤鏂囦腑鎸夐『搴忚幏鍙栫涓�涓潪绌哄瓧娈碉紝鍏煎涓嶅悓鍘傚晢鐨勫瓧娈靛懡鍚�
+ */
+ private String getMapValue(Map<String, Object> source, String... keys) {
+ if (source == null || keys == null) {
+ return null;
+ }
+ for (String key : keys) {
+ Object value = source.get(key);
+ if (value != null && StringUtils.isNotBlank(String.valueOf(value))) {
+ return String.valueOf(value);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 瑙ｆ瀽妫�鏌ユ姤鍛婃椂闂达紝鍏煎甯歌鏃ユ湡鏃堕棿鏍煎紡
+ */
+ private Date parseDateTime(String dateTime) {
+ if (StringUtils.isBlank(dateTime)) {
+ return null;
+ }
+ String[] patterns = {"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd"};
+ for (String pattern : patterns) {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
+ simpleDateFormat.setLenient(false);
+ return simpleDateFormat.parse(dateTime);
+ } catch (ParseException ignored) {
+ // 灏濊瘯涓嬩竴绉嶆牸寮�
+ }
+ }
+ log.warn("妫�鏌ユ姤鍛婃椂闂存牸寮忔棤娉曡В鏋愶細{}", dateTime);
+ return null;
+ }
+
+ /**
+ * 瑙ｆ瀽妫�鏌ユ姤鍛婃暟瀛楀瓧娈碉紝閬垮厤闈炴暟瀛楀唴瀹瑰鑷存帴鍙ｆ姤閿�
+ */
+ private Integer parseInteger(String value) {
+ if (StringUtils.isBlank(value)) {
+ return null;
+ }
+ try {
+ return Integer.valueOf(value.trim());
+ } catch (NumberFormatException e) {
+ log.warn("妫�鏌ユ姤鍛婃暟瀛楀瓧娈垫棤娉曡浆鎹細{}", value);
+ return null;
+ }
+ }
+
@Override
public Map<String, Object> query360PatInfolwl(Long patid, SysUser sysUser) {
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index d9513ec..8eef217 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -949,6 +949,12 @@
</if>
<if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
<if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
+ <if test="startOutHospTime != null">
+ AND date_format(endtime,'%y%m%d') >= date_format(#{startOutHospTime},'%y%m%d')
+ </if>
+ <if test="endOutHospTime != null">
+ AND date_format(endtime,'%y%m%d') <= date_format(#{endOutHospTime},'%y%m%d')
+ </if>
) a where a.finished =1)
</select>
--
Gitblit v1.9.3