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/SvyTaskSingleServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 4
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 160 +++++++++++++++++++++++++++--------------------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 2
smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java | 10 +-
5 files changed, 91 insertions(+), 87 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 450772d..21b1153 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -395,9 +395,9 @@
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
- log.error("---------mq涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿}, sendMagParam:{}, orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
+ log.info("---------mq涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿}, sendMagParam:{}, orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
String dxCode = getDXCode(map.get("address"), sendMagParam.getPhone(), sendMagParam.getContent(), map.get("sendPersonId"), map.get("sendPersonName"), MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()), token);
- log.error("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode);
+ log.info("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode);
ObjectMapper objectMapper = new ObjectMapper();
Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
String code = textParam.get("Code").toString();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index c4db88e..90b3e21 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -214,7 +214,7 @@
log.error("getScriptInfoByCondition鎶ラ敊浜嗭細{}", e.getMessage());
}
- log.error("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
+ log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
if (StringUtils.isEmpty(serviceTaskScriptQues.getPatfrom())) serviceTaskScriptQues.setPatfrom("0");
return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom()));
}
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..73f905f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -80,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);
@@ -117,10 +117,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 +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);
@@ -153,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;
}
@@ -171,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);
@@ -188,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;
@@ -206,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;
@@ -265,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;
@@ -315,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);
@@ -345,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;
@@ -488,7 +492,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;
@@ -621,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);
@@ -661,7 +665,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 +682,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 +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;
@@ -910,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);
@@ -940,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);
@@ -963,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;
@@ -1080,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");
@@ -1292,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");
@@ -1314,7 +1318,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 +1356,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 +1372,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 +1441,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 +1460,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 +1475,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 +1485,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 +1511,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 +1528,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;
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
index 4a9801e..60f8562 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
@@ -45,9 +45,9 @@
@Override
public List<ServiceThirdData> queryList(ServiceThirdData serviceThirdData) {
- log.error("------serviceThirdData鐨勫叆鍙傦細{}", serviceThirdData);
+ log.info("------serviceThirdData鐨勫叆鍙傦細{}", serviceThirdData);
List<ServiceThirdData> serviceThirdDataList = serviceThirdDataMapper.selectServiceThirdDataList(serviceThirdData);
- log.error("------serviceThirdDataList鑾峰彇鏁版嵁鐨勬暟閲忥細{}", serviceThirdDataList.size());
+ log.info("------serviceThirdDataList鑾峰彇鏁版嵁鐨勬暟閲忥細{}", serviceThirdDataList.size());
for (ServiceThirdData std : serviceThirdDataList) {
PipeParser parser = new PipeParser();
Message message = null;
@@ -86,7 +86,7 @@
}
HospitalRecord hospitalRecord = (HospitalRecord) objectList.get(0);
- log.error("hospitalRecord鐨勫�间负锛歿}", hospitalRecord);
+ log.info("hospitalRecord鐨勫�间负锛歿}", hospitalRecord);
//濡傛灉patientid涓虹┖锛屽啀瀛榬ecord灏辨垚鑴忔暟鎹簡
if (StringUtils.isNotBlank(hospitalUserinfo.getPatientID())) {
hospitalRecord.setMessageID(std.getId().toString());
@@ -99,9 +99,9 @@
serviceThirdData2.setRemark("PatientID涓虹┖");
}
serviceThirdData2.setUserInfoId(hospitalUserinfo.getID());
- log.error("serviceThirdData2鐨勫弬鏁帮細{}", serviceThirdData2);
+ log.info("serviceThirdData2鐨勫弬鏁帮細{}", serviceThirdData2);
int ii = serviceThirdDataMapper.updateIsDeal(serviceThirdData2);
- log.error("鏄惁淇敼鎴愬姛锛歿}", ii);
+ log.info("鏄惁淇敼鎴愬姛锛歿}", ii);
} catch (HL7Exception e) {
e.printStackTrace();
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index 15a26e4..6868773 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -111,7 +111,7 @@
}
if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
- log.error("insertOrUpdateSvyTask闇�瑕佺Щ闄ょ殑subId涓猴細{}", serviceSubtask.getId().toString());
+ log.info("insertOrUpdateSvyTask闇�瑕佺Щ闄ょ殑subId涓猴細{}", serviceSubtask.getId().toString());
serviceSubtaskMapper.deleteServiceSubtaskById(serviceSubtask.getId());
redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString());
redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString());
--
Gitblit v1.9.3