From 20dacdd6191b93f13dd8befcbc35b38279c76d82 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 8 Apr 2018 20:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=AB=98=E5=8D=B1?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/job/index/restore/data/SyncDataWork.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java index fda8183..7caba52 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java @@ -3,10 +3,7 @@ package com.lyms.platform.job.index.restore.data; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.HttpClientUtil; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; @@ -847,7 +844,7 @@ public class SyncDataWork { List list2 = null; boolean isdel = false; try { - if (null != antEx && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) { + if (null != antEx && StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) { String otherHighRisk = antEx.getOtherRisk(); List otherHighRisks = new ArrayList<>(); if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { @@ -896,7 +893,7 @@ public class SyncDataWork { } - if (null != antEx && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) { + if (null != antEx && StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) { String otherHighRisk = antEx.getOtherRisk(); List otherHighRisks = new ArrayList<>(); if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { @@ -1025,7 +1022,7 @@ public class SyncDataWork { List list2 = null; boolean isdel = false; try { - if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { String otherHighRisk = antExChuModel.getOtherHighRisk(); List otherHighRisks = new ArrayList<>(); if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { @@ -1052,6 +1049,7 @@ public class SyncDataWork { riskDetailsService.deleteRiskDetails(patientId); } } catch (Exception e) { + ExceptionUtils.catchException(e,"handlRiskChu error."); } Risks risks = new Risks(); @@ -1066,9 +1064,11 @@ public class SyncDataWork { } catch (Exception e) { ERROR_LOGGER.error("convert high risk error." + list2, e); } - if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { + + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) { String otherHighRisk = antExChuModel.getOtherHighRisk(); List otherHighRisks = new ArrayList<>(); + if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) { list2 = JsonUtil.toList(otherHighRisk, Map.class); otherHighRisks.addAll(list2); -- 1.8.3.1