From f2ec675bfae05d139285675fc219d0005e3d009d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 03 七月 2025 10:40:13 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 679 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 609 insertions(+), 70 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 d308c42..73f905f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
@@ -55,9 +56,17 @@
@Autowired
private PatMedOperationItemMapper patMedOperationItemMapper;
@Autowired
+ private PatMedInspectionMapper patMedInspectionMapper;
+ @Autowired
+ private PatMedInspectionItemMapper patMedInspectionItemMapper;
+ @Autowired
private Icd10Mapper icd10Mapper;
@Autowired
private PatMedOuthospMapper patMedOuthospMapper;
+ @Autowired
+ private ServiceSubtaskMapper serviceSubtaskMapper;
+ @Autowired
+ private RedisCache redisCache;
@Value("${defaultPwd}")
private String defaultPwd;
@@ -71,7 +80,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
public Boolean addDeptInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addDeptInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addDeptInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> keShiXX = (Map<String, Object>) yeWuXX.get("KeShiXX");
ExternalDept externalDept = BeanUtil.mapToBean(keShiXX, ExternalDept.class, true);
@@ -108,17 +117,17 @@
}
if (StringUtils.isNotEmpty(externalDept.getShiJianDM()) && externalDept.getShiJianDM().equals("1")) {
int i = sysDeptMapper.insertDept(sysDept);
- log.error("ServiceExternalServiceImpl---addDeptInfo鏄惁鏂板鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁鏂板鎴愬姛锛歿}", i);
} else {
int i = sysDeptMapper.updateDept(sysDept);
- log.error("ServiceExternalServiceImpl---addDeptInfo鏄惁淇敼鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁淇敼鎴愬姛锛歿}", i);
}
return true;
}
@Override
public Boolean addUserInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addUserInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addUserInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> yongHuXX = (Map<String, Object>) yeWuXX.get("YongHuXX");
ExternalUserInfo externalUserInfo = BeanUtil.mapToBean(yongHuXX, ExternalUserInfo.class, true);
@@ -126,8 +135,12 @@
throw new BaseException("externalUserInfo鏄┖鐨勶紝娌℃湁鏁版嵁锛侊紒锛�");
}
SysUser sysUser = new SysUser();
- sysUser.setGuid(externalUserInfo.getZuZhiJGID());
sysUser.setUserName(externalUserInfo.getYongHuDLM());
+ sysUser.setOrgid(externalUserInfo.getZuZhiJGID());
+ //鏍规嵁userName鍒ゆ柇涓�涓嬶紝鏄笉鏄箣鍓嶆湁鏂板
+ SysUser sysUser1 = sysUserMapper.selectUserByUserName(externalUserInfo.getYongHuDLM());
+
+ sysUser.setGuid(externalUserInfo.getZuZhiJGID());
sysUser.setNickName(externalUserInfo.getYongHuXM());
sysUser.setUserType("");
sysUser.setDeptId(null);
@@ -144,17 +157,17 @@
sysUser.setCreateTime(externalUserInfo.getChuangJianSJ());
sysUser.setUpdateTime(externalUserInfo.getXiuGaiSJ());
sysUser.setUpdateBy(externalUserInfo.getXiuGaiRXM());
- sysUser.setOrgid(externalUserInfo.getZuZhiJGID());
+
if (StringUtils.isNotEmpty(externalUserInfo.getShiJianDM()) && externalUserInfo.getShiJianDM().equals("3")) {
sysUser.setStatus("1");
}
sysUser.setBirthday(externalUserInfo.getChuShengRQ());
- if (StringUtils.isNotEmpty(externalUserInfo.getShiJianDM()) && externalUserInfo.getShiJianDM().equals("1")) {
+ if (ObjectUtils.isEmpty(sysUser1)) {
int i = sysUserMapper.insertUser(sysUser);
- log.error("ServiceExternalServiceImpl---addDeptInfo鏄惁鏂板鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁鏂板鎴愬姛锛歿}", i);
} else {
int i = sysUserMapper.updateUser(sysUser);
- log.error("ServiceExternalServiceImpl---addDeptInfo鏄惁淇敼鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addDeptInfo鏄惁淇敼鎴愬姛锛歿}", i);
}
return true;
}
@@ -162,7 +175,7 @@
@Override
public Boolean addOrganInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addOrganInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addOrganInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> ZuZhiJGXX = (Map<String, Object>) yeWuXX.get("ZuZhiJGXX");
ExternalOrganInfo externalOrganInfo = BeanUtil.mapToBean(ZuZhiJGXX, ExternalOrganInfo.class, true);
@@ -179,17 +192,17 @@
baseOrganization.setOrgid(externalOrganInfo.getZuZhiJGID());
if (StringUtils.isNotEmpty(externalOrganInfo.getShiJianDM()) && externalOrganInfo.getShiJianDM().equals("1")) {
int i = baseOrganizationMapper.insertBaseOrganization(baseOrganization);
- log.error("ServiceExternalServiceImpl---addOrganInfo鏄惁鏂板鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addOrganInfo鏄惁鏂板鎴愬姛锛歿}", i);
} else {
int i = baseOrganizationMapper.updateBaseOrganization(baseOrganization);
- log.error("ServiceExternalServiceImpl---addOrganInfo鏄惁淇敼鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addOrganInfo鏄惁淇敼鎴愬姛锛歿}", i);
}
return true;
}
@Override
public Boolean addCheckupReport(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addCheckupReport鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addCheckupReport鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> ZuZhiJGXX = (Map<String, Object>) yeWuXX.get("ZuZhiJGXX");
return false;
@@ -197,7 +210,7 @@
@Override
public Boolean addInHospInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addInHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addInHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("DiZhiXXList") : null;
List<HashMap<String, Object>> epli = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("LianXiRList") : null;
@@ -238,6 +251,7 @@
List<ExternalInHospPatientDiagnoseInfo> hospPatientDiagnoseInfos2 = hospPatientDiagnoseInfos.stream().map(map -> {
ExternalInHospPatientDiagnoseInfo info = new ExternalInHospPatientDiagnoseInfo();
info.setZhenDuanID((String) map.get("ZhenDuanID"));
+ info.setIcd10((String) map.get("Icd10"));
info.setZhenDuanMC((String) map.get("ZhenDuanMC"));
return info;
}).collect(Collectors.toList());
@@ -255,7 +269,7 @@
@Override
public Boolean addInDeptInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addInDeptInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addInDeptInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
Map<String, Object> RuKeXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("RuKeXX") : null;
@@ -305,7 +319,7 @@
@Override
public Boolean cancelInHospInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---cancelInHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---cancelInHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
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);
@@ -335,7 +349,7 @@
@Override
public Boolean addOutHospInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addOutHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addOutHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
Map<String, Object> ChuYuanJL = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ChuYuanJL") : null;
@@ -440,11 +454,146 @@
ExternalInHospPatientDiagnoseInfo info = new ExternalInHospPatientDiagnoseInfo();
info.setZhenDuanID((String) map.get("ZhenDuanID"));
info.setZhenDuanMC((String) map.get("ZhenDuanMC"));
+ info.setIcd10((String) map.get("Icd10"));
return info;
}).collect(Collectors.toList());
- patMedInhosp1.setLeaveicd10code(StringUtils.isNotEmpty(patMedInhosp1.getLeaveicd10code()) ? patMedInhosp1.getLeaveicd10code() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanID() : hospPatientDiagnoseInfos2.get(0).getZhenDuanID());
- patMedInhosp1.setLeavediagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
- patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
+ patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ //patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ }
+
+ patMedInhosp1.setInhospstate("1");
+ if (CollectionUtils.isNotEmpty(patMedInhospList)) {
+ patMedInhosp1.setUpdateTime(new Date());
+ patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ if (i != 1) return false;
+ } else {
+ if (ObjectUtils.isNotEmpty(BingRenXX)) {
+ patMedInhosp1.setHospitalname(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGMC")) ? BingRenXX.get("ZuZhiJGMC").toString() : null);
+ patMedInhosp1.setHospitalcode(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);
+ patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);
+ patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);
+ patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null);
+ patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null);
+ }
+ patMedInhosp1.setPatid(patArchive.getId());
+ patMedInhosp1.setPatname(patArchive.getName());
+
+ patMedInhosp1.setCreateTime(new Date());
+ int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1);
+ if (i != 1) return false;
+ }
+ return true;
+ }
+
+ @Override
+ public Boolean addOutHospJLInfo(Map dataMap) {
+ log.info("ServiceExternalServiceImpl---addOutHospJLInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
+ Map<String, Object> ChuYuanJL = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ChuYuanJL") : null;
+ List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(BingRenXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null;
+ List<HashMap<String, Object>> epli = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("LianXiRList") : null;
+ Map<String, Object> SuiFangJH = ObjectUtils.isNotEmpty(ChuYuanJL) ? (Map<String, Object>) ChuYuanJL.get("SuiFangJH") : null;
+
+ ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ ExternalInHospPatientAddrInfo externalInHospPatientAddrInfo = null;
+ ExternalInHospPatientLiaisonInfo externalInHospPatientLiaisonInfo = null;
+ List<ExternalInHospPatientAddrInfo> epai2 = null;
+ if (CollectionUtils.isNotEmpty(epai)) {
+ epai2 = epai.stream().map(map -> {
+ ExternalInHospPatientAddrInfo info = new ExternalInHospPatientAddrInfo();
+ info.setDiZhiLX((String) map.get("DiZhiLX")); // 鍋囪瀛楁绫诲瀷鏄� Integer
+ info.setDiZhiXX((String) map.get("DiZhiXX"));
+ info.setShengFenDM((String) map.get("ShengFenDM"));
+ info.setShengFenMC((String) map.get("ShengFenMC"));
+ info.setShiDiQDM((String) map.get("ShiDiQDM"));
+ info.setShiDiQMC((String) map.get("ShiDiQMC"));
+ info.setXianQuDM((String) map.get("XianQuDM"));
+ info.setXianQuMC((String) map.get("XianQuMC"));
+ info.setXiangZhenDM((String) map.get("XiangZhenDM"));
+ info.setXiangZhenMC((String) map.get("XiangZhenMC"));
+ info.setCunJiDM((String) map.get("CunJiDM"));
+ info.setQiTaXX((String) map.get("QiTaXX"));
+ info.setYouBian((String) map.get("YouBian"));
+ return info;
+ }).collect(Collectors.toList());
+ }
+ List<ExternalInHospPatientLiaisonInfo> epli2 = null;
+ if (CollectionUtils.isNotEmpty(epli)) {
+ epli2 = epli.stream().map(map -> {
+ ExternalInHospPatientLiaisonInfo info = new ExternalInHospPatientLiaisonInfo();
+ info.setLianXiRXM((String) map.get("LianXiRXM"));
+ info.setLianXiRDH((String) map.get("LianXiRDH"));
+ info.setGuanXiDM((String) map.get("GuanXiDM"));
+ info.setGuanXiMC((String) map.get("GuanXiMC"));
+ return info;
+ }).collect(Collectors.toList());
+ }
+ if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0);
+ if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0);
+ //鏂板鎮ｈ�呭熀鏈俊鎭柊澧炴垨淇敼
+ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
+
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao());
+ patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
+ List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+ String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+ patMedInhosp1.setTagname(tagname);
+ }
+ PatMedInhosp patMedInhosp1 = new PatMedInhosp();
+ if (CollectionUtils.isNotEmpty(patMedInhospList)) patMedInhosp1 = patMedInhospList.get(0);
+ patMedInhosp1.setSchemestatus(2L);
+ patMedInhosp1.setUpdateTime(new Date());
+ patMedInhosp1.setTelcode(patArchive.getTelcode());
+ patMedInhosp1.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID());
+ patMedInhosp1.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
+ patMedInhosp1.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC());
+ patMedInhosp1.setDeptname(externalInHospPatientInfo.getDangQianKSMC());
+ patMedInhosp1.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID());
+ patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID());
+
+ if (ObjectUtils.isNotEmpty(SuiFangJH)) {
+ patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null);
+ if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ patMedInhosp1.setFudate(simpleDateFormat.parse(SuiFangJH.get("SuiFangRQ").toString()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ try {
+ patMedInhosp1.setFudate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(SuiFangJH.get("SuiFangRQ").toString()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ 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.setFuadvice(ObjectUtils.isNotEmpty(SuiFangJH.get("FuZhenZD")) ? SuiFangJH.get("FuZhenZD").toString() : null);
+ patMedInhosp1.setFuspecialadvice(ObjectUtils.isNotEmpty(SuiFangJH.get("QiTaZKJBSF")) ? SuiFangJH.get("QiTaZKJBSF").toString() : null);
+ }
+
+ List<HashMap<String, Object>> zhenDuanList = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("ZhenDuanList") : null;
+ if (CollectionUtils.isNotEmpty(zhenDuanList)) {
+ List<ExternalInHospPatientDiagnoseInfo> hospPatientDiagnoseInfos2 = zhenDuanList.stream().map(map -> {
+ ExternalInHospPatientDiagnoseInfo info = new ExternalInHospPatientDiagnoseInfo();
+ info.setZhenDuanID((String) map.get("ZhenDuanID"));
+ info.setZhenDuanMC((String) map.get("ZhenDuanMC"));
+ info.setIcd10((String) map.get("Icd10"));
+ return info;
+ }).collect(Collectors.toList());
+ patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
+ patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ //patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
}
patMedInhosp1.setInhospstate("1");
@@ -476,7 +625,7 @@
@Override
public Boolean cancelOutHospInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---cancelOutHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---cancelOutHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
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);
@@ -492,12 +641,183 @@
Map<String, Object> JiuZhenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiuZhenXX") : null;
PatMedInhosp patMedInhosp1 = patMedInhospList.get(0);
patMedInhosp1.setSchemestatus(4L);
+ //闇�瑕佸皢鍑洪櫌鐘舵�佹敼鎴愬湪闄�
+ patMedInhosp1.setInhospstate("0");
if (ObjectUtils.isNotEmpty(JiuZhenXX)) {
patMedInhosp1.setOperator(ObjectUtils.isNotEmpty(JiuZhenXX.get("CaoZuoRXM")) ? JiuZhenXX.get("CaoZuoRXM").toString() : null);
patMedInhosp1.setOperatorId(ObjectUtils.isNotEmpty(JiuZhenXX.get("CaoZuoRXM")) ? JiuZhenXX.get("CaoZuoRID").toString() : null);
}
patMedInhosp1.setUpdateTime(new Date());
int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+
+ //鍙栨秷鍑洪櫌锛屽氨涓嶉渶瑕佹湇鍔′簡锛岄渶瑕侀�氳繃patid鍜宻endstate=2鎴栬�卻endstate=1鍘绘煡璇竴涓嬶紝service_subtask閲屾槸鍚︽湁姝ｅ湪鎵ц鐨勪换鍔★紝鏈夌殑璇濓紝绔嬪嵆鍋滀簡
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setPatid(patMedInhosp1.getPatid());
+ serviceSubtaskVO.setSendstate(2L);
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ serviceSubtaskVO.setSendstate(1L);
+ List<ServiceSubtask> serviceSubtaskList1 = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
+ if (CollectionUtils.isNotEmpty(serviceSubtaskList1)) serviceSubtaskList.addAll(serviceSubtaskList1);
+ } else {
+ if (CollectionUtils.isNotEmpty(serviceSubtaskList1)) serviceSubtaskList = serviceSubtaskList1;
+ }
+ //鍘籸edis涓紝鏌ヨ鏄惁鏈塻ubid锛屾湁鐨勮瘽绉婚櫎cache-exist
+ if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
+ for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+ log.info("闇�瑕佺Щ闄ょ殑subId涓猴細{}", serviceSubtask.getId().toString());
+ serviceSubtaskMapper.deleteServiceSubtaskById(serviceSubtask.getId());
+ redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString());
+ redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString());
+ redisCache.removeElementFromList("cache-1", serviceSubtask.getId().toString());
+ redisCache.removeElementFromList("cache-2", serviceSubtask.getId().toString());
+ redisCache.removeElementFromList("cache-3", serviceSubtask.getId().toString());
+ redisCache.removeElementFromList("cache-4", serviceSubtask.getId().toString());
+ }
+ }
+ if (i != 1) return false;
+ }
+ return true;
+ }
+
+ @Override
+ public Boolean addPreOutHospInfo(Map dataMap) {
+ log.info("ServiceExternalServiceImpl---addPreOutHospInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
+ Map<String, Object> ChuYuanJL = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ChuYuanJL") : null;
+ List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(BingRenXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null;
+ List<HashMap<String, Object>> epli = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("LianXiRList") : null;
+ Map<String, Object> SuiFangJH = ObjectUtils.isNotEmpty(ChuYuanJL) ? (Map<String, Object>) ChuYuanJL.get("SuiFangJH") : null;
+
+ ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ ExternalInHospPatientAddrInfo externalInHospPatientAddrInfo = null;
+ ExternalInHospPatientLiaisonInfo externalInHospPatientLiaisonInfo = null;
+ List<ExternalInHospPatientAddrInfo> epai2 = null;
+ if (CollectionUtils.isNotEmpty(epai)) {
+ epai2 = epai.stream().map(map -> {
+ ExternalInHospPatientAddrInfo info = new ExternalInHospPatientAddrInfo();
+ info.setDiZhiLX((String) map.get("DiZhiLX")); // 鍋囪瀛楁绫诲瀷鏄� Integer
+ info.setDiZhiXX((String) map.get("DiZhiXX"));
+ info.setShengFenDM((String) map.get("ShengFenDM"));
+ info.setShengFenMC((String) map.get("ShengFenMC"));
+ info.setShiDiQDM((String) map.get("ShiDiQDM"));
+ info.setShiDiQMC((String) map.get("ShiDiQMC"));
+ info.setXianQuDM((String) map.get("XianQuDM"));
+ info.setXianQuMC((String) map.get("XianQuMC"));
+ info.setXiangZhenDM((String) map.get("XiangZhenDM"));
+ info.setXiangZhenMC((String) map.get("XiangZhenMC"));
+ info.setCunJiDM((String) map.get("CunJiDM"));
+ info.setQiTaXX((String) map.get("QiTaXX"));
+ info.setYouBian((String) map.get("YouBian"));
+ return info;
+ }).collect(Collectors.toList());
+ }
+ List<ExternalInHospPatientLiaisonInfo> epli2 = null;
+ if (CollectionUtils.isNotEmpty(epli)) {
+ epli2 = epli.stream().map(map -> {
+ ExternalInHospPatientLiaisonInfo info = new ExternalInHospPatientLiaisonInfo();
+ info.setLianXiRXM((String) map.get("LianXiRXM"));
+ info.setLianXiRDH((String) map.get("LianXiRDH"));
+ info.setGuanXiDM((String) map.get("GuanXiDM"));
+ info.setGuanXiMC((String) map.get("GuanXiMC"));
+ return info;
+ }).collect(Collectors.toList());
+ }
+ if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0);
+ if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0);
+ //鏂板鎮ｈ�呭熀鏈俊鎭柊澧炴垨淇敼
+ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
+
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao());
+ patMedInhosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
+ List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+ String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+ patMedInhosp1.setTagname(tagname);
+ }
+ Map<String, Object> JiuZhenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiuZhenXX") : null;
+ PatMedInhosp patMedInhosp1 = new PatMedInhosp();
+ if (CollectionUtils.isNotEmpty(patMedInhospList)) patMedInhosp1 = patMedInhospList.get(0);
+ patMedInhosp1.setSchemestatus(2L);
+ try {
+ patMedInhosp1.setEndtime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(JiuZhenXX.get("YuChuYSJ").toString()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ if (ObjectUtils.isNotEmpty(JiuZhenXX)) {
+ patMedInhosp1.setOperator(ObjectUtils.isNotEmpty(JiuZhenXX.get("CaoZuoRXM")) ? JiuZhenXX.get("CaoZuoRXM").toString() : null);
+ patMedInhosp1.setOperatorId(ObjectUtils.isNotEmpty(JiuZhenXX.get("CaoZuoRID")) ? JiuZhenXX.get("CaoZuoRID").toString() : null);
+ patMedInhosp1.setDrname(ObjectUtils.isNotEmpty(JiuZhenXX.get("ZhuZhiYSXM")) ? JiuZhenXX.get("ZhuZhiYSXM").toString() : null);
+ patMedInhosp1.setDrcode(ObjectUtils.isNotEmpty(JiuZhenXX.get("ZhuZhiYSID")) ? JiuZhenXX.get("ZhuZhiYSID").toString() : null);
+ patMedInhosp1.setNurseName(ObjectUtils.isNotEmpty(JiuZhenXX.get("ZeRenHSXM")) ? JiuZhenXX.get("ZeRenHSXM").toString() : null);
+ patMedInhosp1.setNurseId(ObjectUtils.isNotEmpty(JiuZhenXX.get("ZeRenHSID")) ? JiuZhenXX.get("ZeRenHSID").toString() : null);
+ patMedInhosp1.setBedNo(ObjectUtils.isNotEmpty(JiuZhenXX.get("DangQianCWMC")) ? JiuZhenXX.get("DangQianCWMC").toString() : null);
+ }
+ patMedInhosp1.setUpdateTime(new Date());
+ patMedInhosp1.setTelcode(patArchive.getTelcode());
+ patMedInhosp1.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID());
+ patMedInhosp1.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC());
+ patMedInhosp1.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC());
+ patMedInhosp1.setDeptname(externalInHospPatientInfo.getDangQianKSMC());
+ patMedInhosp1.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID());
+ patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID());
+
+ if (ObjectUtils.isNotEmpty(SuiFangJH)) {
+ patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null);
+ if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ patMedInhosp1.setFudate(simpleDateFormat.parse(SuiFangJH.get("SuiFangRQ").toString()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ 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.setFuadvice(ObjectUtils.isNotEmpty(SuiFangJH.get("FuZhenZD")) ? SuiFangJH.get("FuZhenZD").toString() : null);
+ patMedInhosp1.setFuspecialadvice(ObjectUtils.isNotEmpty(SuiFangJH.get("QiTaZKJBSF")) ? SuiFangJH.get("QiTaZKJBSF").toString() : null);
+ }
+
+ List<HashMap<String, Object>> zhenDuanList = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("ZhenDuanList") : null;
+ if (CollectionUtils.isNotEmpty(zhenDuanList)) {
+ List<ExternalInHospPatientDiagnoseInfo> hospPatientDiagnoseInfos2 = zhenDuanList.stream().map(map -> {
+ ExternalInHospPatientDiagnoseInfo info = new ExternalInHospPatientDiagnoseInfo();
+ info.setZhenDuanID((String) map.get("ZhenDuanID"));
+ info.setZhenDuanMC((String) map.get("ZhenDuanMC"));
+ info.setIcd10((String) map.get("Icd10"));
+ return info;
+ }).collect(Collectors.toList());
+ patMedInhosp1.setLeaveicd10code(hospPatientDiagnoseInfos2.get(0).getIcd10());
+ patMedInhosp1.setLeavediagname(hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ //patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() + "," + hospPatientDiagnoseInfos2.get(0).getZhenDuanMC() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
+ }
+
+ patMedInhosp1.setInhospstate("3");
+ if (CollectionUtils.isNotEmpty(patMedInhospList)) {
+ patMedInhosp1.setUpdateTime(new Date());
+ patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ if (i != 1) return false;
+ } else {
+ if (ObjectUtils.isNotEmpty(BingRenXX)) {
+ patMedInhosp1.setHospitalname(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGMC")) ? BingRenXX.get("ZuZhiJGMC").toString() : null);
+ patMedInhosp1.setHospitalcode(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);
+ patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);
+ patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);
+ patMedInhosp1.setInhospno(ObjectUtils.isNotEmpty(BingRenXX.get("BingAnHao")) ? BingRenXX.get("BingAnHao").toString() : null);
+ patMedInhosp1.setSerialnum(ObjectUtils.isNotEmpty(BingRenXX.get("JiuZhenYWID")) ? BingRenXX.get("JiuZhenYWID").toString() : null);
+ }
+ patMedInhosp1.setPatid(patArchive.getId());
+ patMedInhosp1.setPatname(patArchive.getName());
+
+ patMedInhosp1.setCreateTime(new Date());
+ int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1);
if (i != 1) return false;
}
return true;
@@ -505,7 +825,7 @@
@Override
public Boolean addFinshJZInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
String FaSongJGID = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGID")) ? XiaoXiTou.get("FaSongJGID").toString() : null;
@@ -594,7 +914,7 @@
@Override
public Boolean addDiseaseInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addDiseaseInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addDiseaseInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> JiBing = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiBingMLXX") : null;
ExternalDiseaseInfo externalDiseaseInfo = BeanUtil.mapToBean(JiBing, ExternalDiseaseInfo.class, true);
@@ -624,7 +944,7 @@
@Override
public Boolean addWardAreaInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addWardAreaInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addWardAreaInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> bqxx = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingQuXX") : null;
ExternalWardArea externalWardArea = BeanUtil.mapToBean(bqxx, ExternalWardArea.class, true);
@@ -647,24 +967,24 @@
if (StringUtils.isNotEmpty(externalWardArea.getShiJianDM()) && externalWardArea.getShiJianDM().equals("1")) {
sysDept.setCreateTime(externalWardArea.getCreateTime());
int i = sysDeptMapper.insertDept(sysDept);
- log.error("ServiceExternalServiceImpl---addWardAreaInfo鏄惁鏂板鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addWardAreaInfo鏄惁鏂板鎴愬姛锛歿}", i);
} else {
int i = sysDeptMapper.updateDept(sysDept);
- log.error("ServiceExternalServiceImpl---addWardAreaInfo鏄惁淇敼鎴愬姛锛歿}", i);
+ log.info("ServiceExternalServiceImpl---addWardAreaInfo鏄惁淇敼鎴愬姛锛歿}", i);
}
return true;
}
@Override
public Boolean addMedicalTeam(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addMedicalTeam鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addMedicalTeam鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
return true;
}
@Override
public Boolean addOperationInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addOperationInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addOperationInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
@@ -764,7 +1084,7 @@
patMedOperation.setCreateTime(new Date());
patMedOperationMapper.insertPatMedOperation(patMedOperation);
}
- log.error("-----patMedOperation鐨勪富閿甶d涓猴細{}", patMedOperation.getId());
+ log.info("-----patMedOperation鐨勪富閿甶d涓猴細{}", patMedOperation.getId());
if (ObjectUtils.isNotEmpty(ssxx)) {
List<HashMap<String, Object>> ShouShuMXList = (List<HashMap<String, Object>>) ssxx.get("ShouShuMXList");
@@ -926,7 +1246,7 @@
patMedInhosp.setDeptname(externalInHospPatientInfo.getDangQianKSMC());
patMedInhosp.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC());
//杩欓噷鏄簥浣嶅悕绉拌繕鏄簥浣嶇紪鍙凤紵锛燂紵锛�
- patMedInhosp.setBedNo(externalInHospPatientInfo.getDangQianCWID());
+ patMedInhosp.setBedNo(externalInHospPatientInfo.getDangQianCWMC());
patMedInhosp.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
patMedInhosp.setHospitaldistrictid(externalInHospPatientInfo.getDangQianBQID());
patMedInhosp.setGuid(externalInHospPatientInfo.getZuZhiJGID());
@@ -947,7 +1267,7 @@
// patMedInhosp.setIcd10code(StringUtils.isNotEmpty(patMedInhosp.getIcd10code()) ? patMedInhosp.getIcd10code() + "," + externalInHospPatientDiagnoseInfo.getZhenDuanID() : externalInHospPatientDiagnoseInfo.getZhenDuanID());
// patMedInhosp.setDiagname(StringUtils.isNotEmpty(patMedInhosp.getDiagname()) ? patMedInhosp.getDiagname() + "," + externalInHospPatientDiagnoseInfo.getZhenDuanMC() : externalInHospPatientDiagnoseInfo.getZhenDuanMC());
- patMedInhosp.setIcd10code(externalInHospPatientDiagnoseInfo.getZhenDuanID());
+ patMedInhosp.setIcd10code(externalInHospPatientDiagnoseInfo.getIcd10());
patMedInhosp.setDiagname(externalInHospPatientDiagnoseInfo.getZhenDuanMC());
}
@@ -976,7 +1296,7 @@
//鏂板闅忚浠诲姟鍚屾
@Override
public Boolean addTaskInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addTaskInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addTaskInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map<String, Object> bqxx = (Map<String, Object>) yeWuXX.get("BingQuXX");
@@ -995,110 +1315,329 @@
return true;
}
+ //妫�鏌ョ敵璇锋湇鍔�
+ @Override
+ public Boolean addInspectService(Map dataMap) {
+ log.info("ServiceExternalServiceImpl---addInspectService鐨勬柊澧炵殑鍊间负锛歿}", 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> JianChaSQ = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaSQ") : null;
+ List<HashMap<String, Object>> JianChaBWList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("JianChaBWList") : null;
+ List<HashMap<String, Object>> ZhenDuanList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("ZhenDuanList") : null;
+ List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(BingRenXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null;
+
+ ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ externalInHospPatientInfo.setZuZhiJGID(xiaoXiTou.get("FaSongJGID").toString());
+ ExternalInHospPatientAddrInfo externalInHospPatientAddrInfo = null;
+ ExternalInHospPatientLiaisonInfo externalInHospPatientLiaisonInfo = null;
+ List<ExternalInHospPatientAddrInfo> epai2 = null;
+ if (CollectionUtils.isNotEmpty(epai)) {
+ epai2 = epai.stream().map(map -> {
+ ExternalInHospPatientAddrInfo info = new ExternalInHospPatientAddrInfo();
+ info.setDiZhiLX((String) map.get("DiZhiLX")); // 鍋囪瀛楁绫诲瀷鏄� Integer
+ info.setDiZhiXX((String) map.get("DiZhiXX"));
+ info.setShengFenDM((String) map.get("ShengFenDM"));
+ info.setShengFenMC((String) map.get("ShengFenMC"));
+ info.setShiDiQDM((String) map.get("ShiDiQDM"));
+ info.setShiDiQMC((String) map.get("ShiDiQMC"));
+ info.setXianQuDM((String) map.get("XianQuDM"));
+ info.setXianQuMC((String) map.get("XianQuMC"));
+ info.setXiangZhenDM((String) map.get("XiangZhenDM"));
+ info.setXiangZhenMC((String) map.get("XiangZhenMC"));
+ info.setCunJiDM((String) map.get("CunJiDM"));
+ info.setQiTaXX((String) map.get("QiTaXX"));
+ info.setYouBian((String) map.get("YouBian"));
+ return info;
+ }).collect(Collectors.toList());
+ }
+ if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0);
+ //鏂板鎮ｈ�呭熀鏈俊鎭柊澧炴垨淇敼
+ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
+
+ PatMedInspection patMedInspection = new PatMedInspection();
+ if (xiaoXiTou.get("XiaoXiLX").equals("JC_SQ_ShenQing") || xiaoXiTou.get("XiaoXiLX").equals("JC_SQ_XiuGai")) {
+ patMedInspection.setProjecttype(1);
+ } else if (xiaoXiTou.get("XiaoXiLX").equals("JY_SQ_ShenQing") || xiaoXiTou.get("XiaoXiLX").equals("JY_SQ_XiuGai")) {
+ patMedInspection.setProjecttype(0);
+ }
+ patMedInspection.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
+ patMedInspection.setInhospno(externalInHospPatientInfo.getBingAnHao());
+ patMedInspection.setPatidHis(externalInHospPatientInfo.getBingRenID());
+ patMedInspection.setPatname(externalInHospPatientInfo.getXingMing());
+ patMedInspection.setProjecttype(1);
+
+ if (ObjectUtils.isNotEmpty(BingRenXX)) {
+ patMedInspection.setIdcardno(ObjectUtils.isNotEmpty(BingRenXX.get("ZhengJianHM")) ? BingRenXX.get("ZhengJianHM").toString() : null);
+ patMedInspection.setTelcode(ObjectUtils.isNotEmpty(BingRenXX.get("LianXiDH")) ? BingRenXX.get("LianXiDH").toString() : null);
+ }
+ List<PatMedInspection> patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
+ if (ObjectUtils.isNotEmpty(JianChaSQ)) {
+ patMedInspection.setAdviceId(Long.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("YiZhuID")) ? JianChaSQ.get("YiZhuID").toString() : null));
+ patMedInspection.setAppliyid(ObjectUtils.isNotEmpty(JianChaSQ.get("ShenQingDID")) ? JianChaSQ.get("ShenQingDID").toString() : null);
+ patMedInspection.setPriority(ObjectUtils.isNotEmpty(JianChaSQ.get("YouXianJi")) ? JianChaSQ.get("YouXianJi").toString() : null);
+ patMedInspection.setDrcode(ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanRID")) ? JianChaSQ.get("KaiDanRID").toString() : null);
+ patMedInspection.setDrname(ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanRXM")) ? JianChaSQ.get("KaiDanRXM").toString() : null);
+ patMedInspection.setDeptcode(ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanKSID")) ? JianChaSQ.get("KaiDanKSID").toString() : null);
+ patMedInspection.setDeptname(ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanKSMC")) ? JianChaSQ.get("KaiDanKSMC").toString() : null);
+ patMedInspection.setOperatorId(ObjectUtils.isNotEmpty(JianChaSQ.get("ShenHeRID")) ? JianChaSQ.get("ShenHeRID").toString() : null);
+ patMedInspection.setOperatorName(ObjectUtils.isNotEmpty(JianChaSQ.get("ShenHeRXM")) ? JianChaSQ.get("ShenHeRXM").toString() : null);
+ patMedInspection.setTypeId(ObjectUtils.isNotEmpty(JianChaSQ.get("JianChaLXID")) ? JianChaSQ.get("JianChaLXID").toString() : null);
+ patMedInspection.setTypeName(ObjectUtils.isNotEmpty(JianChaSQ.get("JianChaLXMC")) ? JianChaSQ.get("JianChaLXMC").toString() : null);
+ patMedInspection.setMoney(Float.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("JinE")) ? JianChaSQ.get("JinE").toString() : null));
+ patMedInspection.setFilmFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("JiaoPianFBZ")) ? JianChaSQ.get("JiaoPianFBZ").toString() : null));
+ patMedInspection.setBedFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("ChuangBianBZ")) ? JianChaSQ.get("ChuangBianBZ").toString() : null));
+ patMedInspection.setPushFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("TuiChuangBZ")) ? JianChaSQ.get("TuiChuangBZ").toString() : null));
+ patMedInspection.setUrgentFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("JiaJiBZ")) ? JianChaSQ.get("JiaJiBZ").toString() : null));
+ patMedInspection.setNostartFlag(Integer.valueOf(ObjectUtils.isNotEmpty(JianChaSQ.get("WeiShouXZXBZ")) ? JianChaSQ.get("WeiShouXZXBZ").toString() : null));
+ if (ObjectUtils.isNotEmpty(JianChaSQ.get("KaiDanSJ"))) {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ patMedInspection.setOpendate(simpleDateFormat.parse(JianChaSQ.get("KaiDanSJ").toString()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ if (ObjectUtils.isNotEmpty(JianChaSQ.get("ShenHeSJ"))) {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ patMedInspection.setOperatorDate(simpleDateFormat.parse(JianChaSQ.get("ShenHeSJ").toString()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ if (ObjectUtils.isNotEmpty(JianChaSQ.get("ZhiXingSJ"))) {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ patMedInspection.setStartTime(simpleDateFormat.parse(JianChaSQ.get("ZhiXingSJ").toString()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ if (CollectionUtils.isNotEmpty(JianChaBWList)) {
+ List<ExternalInspectionJC> externalInspectionJC = JianChaBWList.stream().map(map -> {
+ ExternalInspectionJC info = new ExternalInspectionJC();
+ info.setJianChaXMID((String) map.get("JianChaXMID"));
+ info.setJianChaXMMC((String) map.get("JianChaXMMC"));
+ info.setJianChaBWID((String) map.get("JianChaBWID"));
+ info.setJianChaBWMC((String) map.get("JianChaBWMC"));
+ return info;
+ }).collect(Collectors.toList());
+ patMedInspection.setProjectId(externalInspectionJC.get(0).getJianChaXMID());
+ patMedInspection.setProjectName(externalInspectionJC.get(0).getJianChaXMMC());
+ patMedInspection.setPartId(externalInspectionJC.get(0).getJianChaBWID());
+ patMedInspection.setPartName(externalInspectionJC.get(0).getJianChaBWMC());
+ }
+
+ if (CollectionUtils.isNotEmpty(ZhenDuanList)) {
+ List<ExternalInspectionJC> externalInspectionJC = ZhenDuanList.stream().map(map -> {
+ ExternalInspectionJC info = new ExternalInspectionJC();
+ info.setZhenDuanID((String) map.get("ZhenDuanID"));
+ info.setZhenDuanMC((String) map.get("ZhenDuanMC"));
+ return info;
+ }).collect(Collectors.toList());
+ patMedInspection.setDiagid(externalInspectionJC.get(0).getZhenDuanID());
+ patMedInspection.setDiagname(externalInspectionJC.get(0).getZhenDuanMC());
+ }
+
+ if (CollectionUtils.isNotEmpty(patMedInspections)) {
+ patMedInspection.setUpdateDate(new Date());
+ patMedInspection.setOrgid(ObjectUtils.isNotEmpty(xiaoXiTou) && ObjectUtils.isNotEmpty(xiaoXiTou.get("FaSongJGID")) ? xiaoXiTou.get("FaSongJGID").toString() : null);
+ // 鏇存柊鎿嶄綔
+ int i = patMedInspectionMapper.updatePatMedInspection(patMedInspection);
+ if (i != 1) return false;
+ } else {
+ patMedInspection.setDelFlag("0");
+ patMedInspection.setCreateTime(new Date());
+ int i = patMedInspectionMapper.insertPatMedInspection(patMedInspection);
+ if (i != 1) return false;
+ }
+
+ return true;
+ }
+
+ //妫�鏌ヨ鎯呮坊鍔�
+ @Override
+ 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;
+ PatMedInspection patMedInspection = new PatMedInspection();
+ PatMedInspectionItem patMedInspectionItem = new PatMedInspectionItem();
+ patMedInspection.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
+ patMedInspection.setInhospno(BingRenXX.get("BingAnHao").toString());
+ patMedInspection.setPatidHis(BingRenXX.get("BingRenID").toString());
+ patMedInspection.setPatname(BingRenXX.get("XingMing").toString());
+ patMedInspection.setAppliyid(JianChaBG.get("ShenQingDID").toString());
+ //鏌ユ壘鎮ｈ�呮鏌ユ楠屼俊鎭紝濡傛灉鏃狅紝杩涜鏂板姞
+ List<PatMedInspection> patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
+ if (CollectionUtils.isNotEmpty(patMedInspections)) {
+ patMedInspectionItem.setInspectionid(patMedInspections.get(0).getId().intValue());
+ } else {
+ addInspectService(dataMap);
+ List<PatMedInspection> patMedInspections2 = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
+ patMedInspectionItem.setInspectionid(patMedInspections2.get(0).getId().intValue());
+ }
+ //妫�鏌ユ楠屾姤鍛婃暟鎹鐞�
+ patMedInspectionItem.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
+ 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();
+ }
+ }
+ }
+ if (ObjectUtils.isNotEmpty(patMedInspectionItems)) {
+ patMedInspectionItem.setUpdateTime(new Date());
+ int i = patMedInspectionItemMapper.updatePatMedInspectionItem(patMedInspectionItem);
+ if (i != 1) return false;
+ } else {
+ patMedInspectionItem.setDelFlag("0");
+ patMedInspectionItem.setCreateTime(new Date());
+ int i = patMedInspectionItemMapper.insertPatMedInspectionItem(patMedInspectionItem);
+ if (i != 1) return false;
+ }
+
+ return true;
+ }
+
private Boolean getType(String type, Map dataMap) {
switch (type) {
case "BR_DA_DangAnJL":
- log.error("鎮ｈ�呮。妗堝缓绔嬪叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("鎮ｈ�呮。妗堝缓绔嬪叆鍙傜被鍨嬩负锛歿}", type);
return true;
case "BR_DA_DangAnXG":
- log.error("鎮ｈ�呮。妗堜慨鏀瑰叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("鎮ｈ�呮。妗堜慨鏀瑰叆鍙傜被鍨嬩负锛歿}", type);
return true;
case "JZ_MZ_ZhenDuanXXLR":
- log.error("鎮ｈ�呰瘖鏂俊鎭棬璇婂綍鍏ュ叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("鎮ｈ�呰瘖鏂俊鎭棬璇婂綍鍏ュ叆鍙傜被鍨嬩负锛歿}", type);
return true;
case "JZ_ZY_ZhenDuanXXLR":
- log.error("鎮ｈ�呰瘖鏂俊鎭綇闄㈠綍鍏ュ叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("鎮ｈ�呰瘖鏂俊鎭綇闄㈠綍鍏ュ叆鍙傜被鍨嬩负锛歿}", type);
return true;
case "YZ_MZ_YiZhuSQ":
- log.error("闂ㄨ瘖鍖诲槺鐢宠鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("闂ㄨ瘖鍖诲槺鐢宠鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "YZ_ZY_YiZhuZX":
- log.error("浣忛櫌鍖诲槺鎵ц鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("浣忛櫌鍖诲槺鎵ц鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "YZ_MZ_YiZhuXG":
- log.error("闂ㄨ瘖鍖诲槺淇敼鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("闂ㄨ瘖鍖诲槺淇敼鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "YZ_MZ_YiZhuCX":
- log.error("闂ㄨ瘖鍖诲槺鎾ら攢鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("闂ㄨ瘖鍖诲槺鎾ら攢鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "YZ_MZ_YiZhuCS":
- log.error("闂ㄨ瘖鍖诲槺鍒犻櫎鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("闂ㄨ瘖鍖诲槺鍒犻櫎鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "JC_SQ_ShenQing":
- log.error("妫�鏌ョ敵璇峰崟鍏ュ弬绫诲瀷涓猴細{}", type);
- return true;
+ log.info("妫�鏌ョ敵璇峰崟鍏ュ弬绫诲瀷涓猴細{}", type);
+ return addInspectService(dataMap);
case "JC_SQ_XiuGai":
- log.error("妫�鏌ョ敵璇蜂俊鎭洿鏂板叆鍙傜被鍨嬩负锛歿}", type);
- return true;
+ log.info("妫�鏌ョ敵璇蜂俊鎭洿鏂板叆鍙傜被鍨嬩负锛歿}", type);
+ return addInspectService(dataMap);
case "JC_SQ_CheXiao":
- log.error("妫�鏌ユ挙閿�鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("妫�鏌ユ挙閿�鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
+ case "JC_BG_BaoGao":
+ log.info("妫�鏌ユ姤鍛婂叆鍙傜被鍨嬩负锛歿}", type);
+ return addInspectBGService(dataMap);
case "JY_SQ_ShenQing":
- log.error("妫�楠岀敵璇峰叆鍙傜被鍨嬩负锛歿}", type);
- return true;
+ log.info("妫�楠岀敵璇峰叆鍙傜被鍨嬩负锛歿}", type);
+ return addInspectService(dataMap);
case "JY_SQ_CheXiao":
- log.error("妫�楠屾挙閿�鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("妫�楠屾挙閿�鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "JY_SQ_XiuGai":
- log.error("妫�楠屼慨鏀瑰叆鍙傜被鍨嬩负杈咃細{}", type);
- return true;
+ log.info("妫�楠屼慨鏀瑰叆鍙傜被鍨嬩负杈咃細{}", type);
+ return addInspectService(dataMap);
case "JY_SQ_BiaoBenCJ":
- log.error("妫�楠屾爣鏈噰闆嗗叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("妫�楠屾爣鏈噰闆嗗叆鍙傜被鍨嬩负锛歿}", type);
return true;
case "JY_SQ_QuXiaoBBCJ":
- log.error("鍙栨秷妫�楠屾爣鏈噰闆嗗叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("鍙栨秷妫�楠屾爣鏈噰闆嗗叆鍙傜被鍨嬩负锛歿}", type);
return true;
case "SM_SQ_ShenQing":
- log.error("鎵嬫湳鐢宠鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鎵嬫湳鐢宠鍏ュ弬绫诲瀷涓猴細{}", type);
addOperationInfo(dataMap);
return true;
case "TJ_YW_BaoGaoXX":
- log.error("浣撴鎶ュ憡鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("浣撴鎶ュ憡鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "TJ_YW_QuXiaoBG":
- log.error("鍙栨秷浣撴鎶ュ憡鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鍙栨秷浣撴鎶ュ憡鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "JG_ZZ_JiGou":
- log.error("缁勭粐鏈烘瀯鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("缁勭粐鏈烘瀯鍏ュ弬绫诲瀷涓猴細{}", type);
return addOrganInfo(dataMap);
case "JG_ZZ_KeShi":
- log.error("绉戝鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("绉戝鍏ュ弬绫诲瀷涓猴細{}", type);
return addDeptInfo(dataMap);
case "JG_YH_JiBenXX":
- log.error("鐢ㄦ埛淇℃伅鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鐢ㄦ埛淇℃伅鍏ュ弬绫诲瀷涓猴細{}", type);
return addUserInfo(dataMap);
case "fu_task":
- log.error("fu_task鏈嶅姟鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("fu_task鏈嶅姟鍏ュ弬绫诲瀷涓猴細{}", type);
return addTaskInfo(dataMap);
case "GY_ZD_JiBingML":
- log.error("鐤剧梾鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鐤剧梾鍏ュ弬绫诲瀷涓猴細{}", type);
return addDiseaseInfo(dataMap);
case "YP_ZD_YaoPinCDJG":
- log.error("鑽搧浜у湴浠锋牸鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鑽搧浜у湴浠锋牸鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "JZ_MZ_WanChengJZ":
- log.error("瀹屾垚鎺ヨ瘖鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("瀹屾垚鎺ヨ瘖鍏ュ弬绫诲瀷涓猴細{}", type);
return addFinshJZInfo(dataMap);
case "JZ_ZY_RuYuanDJ":
- log.error("鍏ラ櫌鐧昏鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鍏ラ櫌鐧昏鍏ュ弬绫诲瀷涓猴細{}", type);
return addInHospInfo(dataMap);
case "JZ_ZY_QuXiaoRY":
- log.error("鍙栨秷鍏ラ櫌鐧昏鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鍙栨秷鍏ラ櫌鐧昏鍏ュ弬绫诲瀷涓猴細{}", type);
return cancelInHospInfo(dataMap);
case "JZ_ZY_ChuYuan":
- log.error("鎮ｈ�呭嚭闄㈠叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("鎮ｈ�呭嚭闄㈠叆鍙傜被鍨嬩负锛歿}", type);
return addOutHospInfo(dataMap);
+ case "BL_JL_ChuYuanJL":
+ log.info("鎮ｈ�呭嚭闄㈣褰曞叆鍙傜被鍨嬩负锛歿}", type);
+ return addOutHospJLInfo(dataMap);
case "JZ_ZY_QuXiaoCY":
- log.error("鍙栨秷鍑洪櫌鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鍙栨秷鍑洪櫌鍏ュ弬绫诲瀷涓猴細{}", type);
return cancelOutHospInfo(dataMap);
+ case "JZ_ZY_YuChuYuan":
+ log.info("鎮ｈ�呴鍑洪櫌鍏ュ弬绫诲瀷涓猴細{}", type);
+ return addPreOutHospInfo(dataMap);
case "JG_ZZ_BingQu":
- log.error("鐥呭尯淇℃伅鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鐥呭尯淇℃伅鍏ュ弬绫诲瀷涓猴細{}", type);
return addWardAreaInfo(dataMap);
case "JG_ZZ_YiLiaoZYS":
- log.error("鍖荤枟缁勫尰鐢熶负锛歿}", type);
+ log.info("鍖荤枟缁勫尰鐢熶负锛歿}", type);
return addMedicalTeam(dataMap);
case "JZ_ZY_RuKe":
- log.error("鍏ョ鐨勬暟鎹负锛歿}", type);
+ log.info("鍏ョ鐨勬暟鎹负锛歿}", type);
return addInDeptInfo(dataMap);
}
return true;
--
Gitblit v1.9.3