From 2e952232f71eae1bf92590471fc7f5d20a1af873 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 31 七月 2025 11:30:48 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 263 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 184 insertions(+), 79 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 387c0b9..b92d0c0 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -71,6 +71,9 @@
@Value("${defaultPwd}")
private String defaultPwd;
+ @Value("${noLongTask}")
+ private List<String> noLongTask;
+
public Boolean generalInterface(Map dataMap) {
Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
String xiaoXiLX = XiaoXiTou.get("XiaoXiLX").toString();
@@ -80,7 +83,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);
@@ -117,10 +120,10 @@
}
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;
}
@@ -135,8 +138,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);
@@ -153,17 +160,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;
}
@@ -171,7 +178,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);
@@ -188,17 +195,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;
@@ -206,7 +213,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;
@@ -265,7 +272,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;
@@ -315,7 +322,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);
@@ -345,7 +352,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;
@@ -391,6 +398,7 @@
if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0);
//鏂板鎮ｈ�呭熀鏈俊鎭柊澧炴垨淇敼
PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo);
+
PatMedInhosp patMedInhosp = new PatMedInhosp();
patMedInhosp.setInhospno(externalInHospPatientInfo.getBingAnHao());
@@ -463,6 +471,10 @@
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
patMedInhosp1.setUpdateTime(new Date());
patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
+ //涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
+ patMedInhosp1.setFuflag("1");
+ }
int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
if (i != 1) return false;
} else {
@@ -480,6 +492,11 @@
patMedInhosp1.setPatname(patArchive.getName());
patMedInhosp1.setCreateTime(new Date());
+ if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
+ //涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
+ patMedInhosp1.setFuflag("1");
+ }
+
int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1);
if (i != 1) return false;
}
@@ -488,7 +505,7 @@
@Override
public Boolean addOutHospJLInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addOutHospJLInfo鐨勬柊澧炵殑鍊间负锛歿}", 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;
@@ -596,6 +613,10 @@
if (CollectionUtils.isNotEmpty(patMedInhospList)) {
patMedInhosp1.setUpdateTime(new Date());
patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+ if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
+ //涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
+ patMedInhosp1.setFuflag("1");
+ }
int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
if (i != 1) return false;
} else {
@@ -613,6 +634,10 @@
patMedInhosp1.setPatname(patArchive.getName());
patMedInhosp1.setCreateTime(new Date());
+ if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
+ //涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
+ patMedInhosp1.setFuflag("1");
+ }
int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1);
if (i != 1) return false;
}
@@ -621,7 +646,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);
@@ -661,7 +686,7 @@
//鍘籸edis涓紝鏌ヨ鏄惁鏈塻ubid锛屾湁鐨勮瘽绉婚櫎cache-exist
if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
- log.error("闇�瑕佺Щ闄ょ殑subId涓猴細{}", serviceSubtask.getId().toString());
+ log.info("闇�瑕佺Щ闄ょ殑subId涓猴細{}", serviceSubtask.getId().toString());
serviceSubtaskMapper.deleteServiceSubtaskById(serviceSubtask.getId());
redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString());
redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString());
@@ -678,7 +703,7 @@
@Override
public Boolean addPreOutHospInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addPreOutHospInfo鐨勬柊澧炵殑鍊间负锛歿}", 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;
@@ -821,7 +846,10 @@
@Override
public Boolean addFinshJZInfo(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ log.info("ServiceExternalServiceImpl---addFinshJZInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
+ //鍏堝琛ㄨ繘琛岀淮鎶�
+ tableMaintenance();
+
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
String FaSongJGID = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGID")) ? XiaoXiTou.get("FaSongJGID").toString() : null;
@@ -875,12 +903,16 @@
patMedOuthosp.setOrgid(FaSongJGID);
patMedOuthosp.setHospitalname(FaSongJGMC);
+ //杩欎釜闇�瑕佺瓑HIS閭ｈ竟鍛婅瘔鍙栧摢涓瓧娈碉紝鐜板湪杩樻槸涓嶅鐨�
+ patMedOuthosp.setFudate(externalJZInfo.getSfrq());
+
for (ExternalDiagnosisInfo externalDiagnosisInfo : externalDiagnosisInfoList) {
if (externalDiagnosisInfo.getZhenDuanLBMC().equals("涓昏瘖鏂�")) {
patMedOuthosp.setDiagname(externalDiagnosisInfo.getZhenDuanMC());
patMedOuthosp.setDrcode(externalDiagnosisInfo.getZhenDuanYSID());
patMedOuthosp.setDrname(externalDiagnosisInfo.getZhenDuanYSXM());
patMedOuthosp.setIcd10code(externalDiagnosisInfo.getIcd10());
+ patMedOuthosp.setFuflag("0");
}
}
for (ExternalWZInfo externalWZInfo : ExternalWZInfoList) {
@@ -895,22 +927,92 @@
if (CollectionUtils.isNotEmpty(patMedOuthosps)) {
patMedOuthosp.setId(patMedOuthosps.get(0).getId());
patMedOuthosp.setUpdateTime(new Date());
+ if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedOuthosp.getOrgid())) {
+ //涓嶉渶瑕侀暱鏈熶换鍔￠殢璁匡紝鐢卞尰鐢熻嚜宸卞幓闅忚锛堜附姘翠腑鍖婚櫌棣栨鎻愬嚭锛�
+ patMedOuthosp.setFuflag("1");
+ }
i = patMedOuthospMapper.updatePatMedOuthosp(patMedOuthosp);
} else {
patMedOuthosp.setCreateTime(new Date());
patMedOuthosp.setUpdateTime(new Date());
+ if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedOuthosp.getOrgid())) {
+ //涓嶉渶瑕侀暱鏈熶换鍔￠殢璁�
+ patMedOuthosp.setFuflag("1");
+ }
i = patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp);
}
+
+ //鍏堥�氳繃韬唤璇佸拰绉戝鏌ヨ璇ユ偅鑰呮槸鍚︽湁闇�瑕侀殢璁跨殑(鏅畞鎻愬嚭鏉ョ殑)
+ if (patMedOuthosp.getOrgid().equals("47255004333112711A1001")) {
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setSfzh(patMedOuthosp.getIdcardno());
+ serviceSubtaskVO.setDeptcode(patMedOuthosp.getDeptcode());
+ serviceSubtaskVO.setSendstate(2L);
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
+ for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+ serviceSubtask.setSendstate(6L);
+ serviceSubtask.setRemark("鎮ｈ�呭凡缁忓洖鏉ュ璇�");
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ }
+ }
+ }
+
if (i > 0) {
return true;
}
-
return false;
+ }
+
+
+ public void tableMaintenance() {
+ // 1. 鍒ゆ柇琛ㄦ暟鎹噺
+ int count = patMedOuthospMapper.countPatMedOuthosp();
+ if (count > 3000000) {
+ // 2. 鍐疯棌琛ㄥ苟鏂板缓
+ String timeSuffix = new SimpleDateFormat("yyyyMM").format(new Date());
+ String oldName = "pat_med_outhosp";
+ String newName = oldName + "_" + timeSuffix;
+
+ // 鍐疯棌
+ patMedOuthospMapper.renameTable(oldName, newName);
+
+ // 3. 璁＄畻鎵�鏈夎〃鐨勬渶澶d
+ List<String> tableNames = patMedOuthospMapper.getAllOuthospTableNames();
+ long maxId = 0;
+ for (String tableName : tableNames) {
+ Long tableMaxId = patMedOuthospMapper.getMaxIdFromTable(tableName);
+ if (tableMaxId != null && tableMaxId > maxId) {
+ maxId = tableMaxId;
+ }
+ }
+
+ // 4. 鏂板缓(姝ゆ椂鍙墿鍐疯〃锛孭atMedOuthosp娌′簡锛岄渶瑕佹柊寤轰竴涓�)
+ patMedOuthospMapper.createPatMedOuthosp(newName, oldName);
+
+ //5.璁剧疆鏂拌〃鑷涓婚敭
+ patMedOuthospMapper.createPatMedOuthospAutoAdd(oldName);
+ //6. 璁剧疆鏂拌〃鑷璧峰鍊�
+ patMedOuthospMapper.setAutoIncrement(oldName, maxId + 1);
+
+ // 7. 鏇存柊/鏂板缓瑙嗗浘
+ // 閲嶆柊鑾峰彇鎵�鏈夎〃鍚嶏紙鍖呭惈鍒氭柊寤虹殑涓昏〃锛�
+ List<String> allTables = patMedOuthospMapper.getAllOuthospTableNames();
+ StringBuilder sb = new StringBuilder();
+ sb.append("CREATE OR REPLACE VIEW v_pat_med_outhosp AS ");
+ for (int i = 0; i < allTables.size(); i++) {
+ sb.append("SELECT * FROM ").append(allTables.get(i));
+ if (i < allTables.size() - 1) {
+ sb.append(" UNION ALL ");
+ }
+ }
+ patMedOuthospMapper.createOrReplaceView(sb.toString());
+ }
}
@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);
@@ -940,7 +1042,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);
@@ -963,24 +1065,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;
@@ -1080,7 +1182,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");
@@ -1146,6 +1248,9 @@
PatArchive patArchive = new PatArchive();
//濡傛灉鏄垰鍑虹敓鐨勫皬瀛╁瓙锛屾槸娌℃湁韬唤璇佺殑锛屾�庝箞澶勭悊锛燂紵锛燂紵锛燂紵锛燂紵
patArchive.setIdcardno(externalInHospPatientInfo.getZhengJianHM());
+ //濡傛灉韬唤璇佷负绌虹殑璇濓紝灏辩敤灏辫瘖鍗″彿浠ｆ浛
+ if (StringUtils.isEmpty(externalInHospPatientInfo.getZhengJianHM()))
+ patArchive.setIdcardno(externalInHospPatientInfo.getJiuZhenKH());
patArchive.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
List<PatArchive> patArchives = null;
if (ObjectUtils.isNotEmpty(patArchive.getIdcardno()))
@@ -1292,7 +1397,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");
@@ -1314,7 +1419,7 @@
//妫�鏌ョ敵璇锋湇鍔�
@Override
public Boolean addInspectService(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addInspectService鐨勬柊澧炵殑鍊间负锛歿}", 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;
@@ -1352,9 +1457,9 @@
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")){
+ 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")){
+ } else if (xiaoXiTou.get("XiaoXiLX").equals("JY_SQ_ShenQing") || xiaoXiTou.get("XiaoXiLX").equals("JY_SQ_XiuGai")) {
patMedInspection.setProjecttype(0);
}
patMedInspection.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
@@ -1368,7 +1473,7 @@
patMedInspection.setTelcode(ObjectUtils.isNotEmpty(BingRenXX.get("LianXiDH")) ? BingRenXX.get("LianXiDH").toString() : null);
}
List<PatMedInspection> patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
- if(ObjectUtils.isNotEmpty(JianChaSQ)){
+ 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);
@@ -1437,13 +1542,13 @@
patMedInspection.setDiagname(externalInspectionJC.get(0).getZhenDuanMC());
}
- if (CollectionUtils.isNotEmpty(patMedInspections)){
+ 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 {
+ } else {
patMedInspection.setDelFlag("0");
patMedInspection.setCreateTime(new Date());
int i = patMedInspectionMapper.insertPatMedInspection(patMedInspection);
@@ -1456,7 +1561,7 @@
//妫�鏌ヨ鎯呮坊鍔�
@Override
public Boolean addInspectBGService(Map dataMap) {
- log.error("ServiceExternalServiceImpl---addInspectBGService鐨勬柊澧炵殑鍊间负锛歿}", 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;
@@ -1471,9 +1576,9 @@
patMedInspection.setAppliyid(JianChaBG.get("ShenQingDID").toString());
//鏌ユ壘鎮ｈ�呮鏌ユ楠屼俊鎭紝濡傛灉鏃狅紝杩涜鏂板姞
List<PatMedInspection> patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
- if(CollectionUtils.isNotEmpty(patMedInspections)){
+ if (CollectionUtils.isNotEmpty(patMedInspections)) {
patMedInspectionItem.setInspectionid(patMedInspections.get(0).getId().intValue());
- }else{
+ } else {
addInspectService(dataMap);
List<PatMedInspection> patMedInspections2 = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
patMedInspectionItem.setInspectionid(patMedInspections2.get(0).getId().intValue());
@@ -1481,7 +1586,7 @@
//妫�鏌ユ楠屾姤鍛婃暟鎹鐞�
patMedInspectionItem.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
List<PatMedInspectionItem> patMedInspectionItems = patMedInspectionItemMapper.selectPatMedInspectionItemList(patMedInspectionItem);
- if (ObjectUtils.isNotEmpty(JianChaBG)){
+ if (ObjectUtils.isNotEmpty(JianChaBG)) {
patMedInspectionItem.setInspectionName(JianChaBG.get("JianChaHao").toString());
patMedInspectionItem.setReportid(JianChaBG.get("JianChaHao").toString());
patMedInspectionItem.setStatuscode(JianChaBG.get("DangQianZTDM").toString());
@@ -1507,11 +1612,11 @@
}
}
}
- if(ObjectUtils.isNotEmpty(patMedInspectionItems)){
+ if (ObjectUtils.isNotEmpty(patMedInspectionItems)) {
patMedInspectionItem.setUpdateTime(new Date());
int i = patMedInspectionItemMapper.updatePatMedInspectionItem(patMedInspectionItem);
if (i != 1) return false;
- }else {
+ } else {
patMedInspectionItem.setDelFlag("0");
patMedInspectionItem.setCreateTime(new Date());
int i = patMedInspectionItemMapper.insertPatMedInspectionItem(patMedInspectionItem);
@@ -1524,116 +1629,116 @@
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);
+ log.info("妫�鏌ョ敵璇峰崟鍏ュ弬绫诲瀷涓猴細{}", type);
return addInspectService(dataMap);
case "JC_SQ_XiuGai":
- log.error("妫�鏌ョ敵璇蜂俊鎭洿鏂板叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("妫�鏌ョ敵璇蜂俊鎭洿鏂板叆鍙傜被鍨嬩负锛歿}", type);
return addInspectService(dataMap);
case "JC_SQ_CheXiao":
- log.error("妫�鏌ユ挙閿�鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("妫�鏌ユ挙閿�鍏ュ弬绫诲瀷涓猴細{}", type);
return true;
case "JC_BG_BaoGao":
- log.error("妫�鏌ユ姤鍛婂叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("妫�鏌ユ姤鍛婂叆鍙傜被鍨嬩负锛歿}", type);
return addInspectBGService(dataMap);
case "JY_SQ_ShenQing":
- log.error("妫�楠岀敵璇峰叆鍙傜被鍨嬩负锛歿}", type);
+ 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);
+ 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.error("鎮ｈ�呭嚭闄㈣褰曞叆鍙傜被鍨嬩负锛歿}", type);
+ log.info("鎮ｈ�呭嚭闄㈣褰曞叆鍙傜被鍨嬩负锛歿}", type);
return addOutHospJLInfo(dataMap);
case "JZ_ZY_QuXiaoCY":
- log.error("鍙栨秷鍑洪櫌鍏ュ弬绫诲瀷涓猴細{}", type);
+ log.info("鍙栨秷鍑洪櫌鍏ュ弬绫诲瀷涓猴細{}", type);
return cancelOutHospInfo(dataMap);
case "JZ_ZY_YuChuYuan":
- log.error("鎮ｈ�呴鍑洪櫌鍏ュ弬绫诲瀷涓猴細{}", type);
+ 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