From acd62c1684cbde71954252ffdf89d0918491e6fc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 02 四月 2025 19:48:10 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 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 24b6751..037a99a 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -378,7 +378,7 @@
patMedInhosp1.setFuperiod(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangZQJY")) ? SuiFangJH.get("SuiFangZQJY").toString() : null);
patMedInhosp1.setFutypecode(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangFSDM")) ? SuiFangJH.get("SuiFangFSDM").toString() : null);
patMedInhosp1.setFutypedesc(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangFSMC")) ? SuiFangJH.get("SuiFangFSMC").toString() : null);
- patMedInhosp1.setFuadivce(ObjectUtils.isNotEmpty(SuiFangJH.get("FuZhenZD")) ? SuiFangJH.get("FuZhenZD").toString() : null);
+ patMedInhosp1.setFuadvice(ObjectUtils.isNotEmpty(SuiFangJH.get("FuZhenZD")) ? SuiFangJH.get("FuZhenZD").toString() : null);
patMedInhosp1.setFuspecialadvice(ObjectUtils.isNotEmpty(SuiFangJH.get("QiTaZKJBSF")) ? SuiFangJH.get("QiTaZKJBSF").toString() : null);
}
@@ -543,8 +543,8 @@
icd10.setGuid(externalDiseaseInfo.getZuZhiJGID());
icd10.setLastflag(externalDiseaseInfo.getMOJIBZ());
icd10.setChimedflag("" + externalDiseaseInfo.getZhongYiZDBZ());
+ icd10.setUpdateTime(new Date());
if (CollectionUtils.isNotEmpty(icd10s)) {
- icd10.setUpdateTime(new Date());
icd10.setIcdid(icd10s.get(0).getIcdid());
icd10Mapper.updateIcd10(icd10);
} else {
@@ -561,7 +561,7 @@
Map<String, Object> bqxx = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingQuXX") : null;
ExternalWardArea externalWardArea = BeanUtil.mapToBean(bqxx, ExternalWardArea.class, true);
SysDept sysDept = new SysDept();
- sysDept.setGuid(externalWardArea.getZuZhiJGID());
+ sysDept.setOrgid(externalWardArea.getZuZhiJGID());
sysDept.setHisDeptId(externalWardArea.getBingQuID());
sysDept.setDeptName(externalWardArea.getBingQuMC());
@@ -571,19 +571,26 @@
sysDept.setDeptCode(externalWardArea.getBingQuID());
sysDept.setCreateBy(externalWardArea.getChuangJianRXM());
sysDept.setType(externalWardArea.getBingQuLXDM());
- sysDept.setCreateTime(externalWardArea.getCreateTime());
sysDept.setUpdateTime(externalWardArea.getUpdateTime());
sysDept.setUpdateBy(externalWardArea.getUpdateBy());
if (StringUtils.isNotEmpty(externalWardArea.getShiJianDM()) && externalWardArea.getShiJianDM().equals("3")) {
sysDept.setStatus("1");
}
if (StringUtils.isNotEmpty(externalWardArea.getShiJianDM()) && externalWardArea.getShiJianDM().equals("1")) {
+ sysDept.setCreateTime(externalWardArea.getCreateTime());
int i = sysDeptMapper.insertDept(sysDept);
log.error("ServiceExternalServiceImpl---addWardAreaInfo鏄惁鏂板鎴愬姛锛歿}", i);
} else {
int i = sysDeptMapper.updateDept(sysDept);
log.error("ServiceExternalServiceImpl---addWardAreaInfo鏄惁淇敼鎴愬姛锛歿}", i);
}
+ return true;
+ }
+
+ @Override
+ public Boolean addMedicalTeam(Map dataMap) {
+ log.error("ServiceExternalServiceImpl---addMedicalTeam鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+
return true;
}
@@ -796,19 +803,21 @@
if (ObjectUtils.isNotEmpty(externalInHospPatientLiaisonInfo))
patArchive.setRelativetelcode(externalInHospPatientLiaisonInfo.getLianXiRDH());
patArchive.setInhospno(externalInHospPatientInfo.getBingAnHao());
- patArchive.setCreateTime(new Date());
+
patArchive.setIdcardtype(externalInHospPatientInfo.getZhengJianLXMC());
if (CollectionUtils.isNotEmpty(patArchives)) {
//濡傛灉涓嶄负绌猴紝鐩存帴灏嗘煡璇㈠嚭鏉ョ殑瀵硅薄杩斿洖
PatArchive patArchive1 = patArchives.get(0);
String orgid = patArchive1.getOrgid();
if (StringUtils.isNotEmpty(orgid)) {
+ patArchive.setUpdateTime(new Date());
patArchive.setId(patArchive1.getId());
patArchiveMapper.updatePatArchive(patArchive);
- return patArchive;
}
+ } else {
+ patArchive.setCreateTime(new Date());
+ patArchiveMapper.insertPatArchiveSingle(patArchive);
}
- patArchiveMapper.insertPatArchiveSingle(patArchive);
//鏂板睘淇℃伅
if (ObjectUtils.isNotEmpty(externalInHospPatientInfo.getExternalInHospPatientLiaisonInfos())) {
for (ExternalInHospPatientLiaisonInfo external : externalInHospPatientInfo.getExternalInHospPatientLiaisonInfos()) {
@@ -997,8 +1006,11 @@
log.error("鍙栨秷鍑洪櫌鍏ュ弬绫诲瀷涓猴細{}", type);
return cancelOutHospInfo(dataMap);
case "JG_ZZ_BingQu":
- log.error("鐥呭尯淇℃伅鍏ュ弬绫诲瀷涓鸿緟锛歿}", type);
+ log.error("鐥呭尯淇℃伅鍏ュ弬绫诲瀷涓猴細{}", type);
return addWardAreaInfo(dataMap);
+ case "JG_ZZ_YiLiaoZYS":
+ log.error("鍖荤枟缁勫尰鐢熶负锛歿}", type);
+ return addMedicalTeam(dataMap);
}
return true;
}
--
Gitblit v1.9.3