jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 20dacdd6191b93f13dd8befcbc35b38279c76d82

Authored by liquanyu
1 parent 5237ba6fa9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

自定义高危为空判断添加

Showing 1 changed file with 8 additions and 8 deletions

platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java View file @ 20dacdd
... ... @@ -3,10 +3,7 @@
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
5 5 import com.lyms.platform.common.enums.YnEnums;
6   -import com.lyms.platform.common.utils.DateUtil;
7   -import com.lyms.platform.common.utils.HttpClientUtil;
8   -import com.lyms.platform.common.utils.JsonUtil;
9   -import com.lyms.platform.common.utils.SystemConfig;
  6 +import com.lyms.platform.common.utils.*;
10 7 import com.lyms.platform.permission.model.Organization;
11 8 import com.lyms.platform.permission.model.OrganizationQuery;
12 9 import com.lyms.platform.permission.model.Users;
... ... @@ -847,7 +844,7 @@
847 844 List list2 = null;
848 845 boolean isdel = false;
849 846 try {
850   - if (null != antEx && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) {
  847 + if (null != antEx && StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) {
851 848 String otherHighRisk = antEx.getOtherRisk();
852 849 List<Map> otherHighRisks = new ArrayList<>();
853 850 if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) {
... ... @@ -896,7 +893,7 @@
896 893 }
897 894  
898 895  
899   - if (null != antEx && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) {
  896 + if (null != antEx && StringUtils.isNotEmpty(antEx.getOtherRisk()) && !"{}".equals(antEx.getOtherRisk())&& !"[]".equals(antEx.getOtherRisk())) {
900 897 String otherHighRisk = antEx.getOtherRisk();
901 898 List<Map> otherHighRisks = new ArrayList<>();
902 899 if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) {
... ... @@ -1025,7 +1022,7 @@
1025 1022 List list2 = null;
1026 1023 boolean isdel = false;
1027 1024 try {
1028   - if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
  1025 + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
1029 1026 String otherHighRisk = antExChuModel.getOtherHighRisk();
1030 1027 List<Map> otherHighRisks = new ArrayList<>();
1031 1028 if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) {
... ... @@ -1052,6 +1049,7 @@
1052 1049 riskDetailsService.deleteRiskDetails(patientId);
1053 1050 }
1054 1051 } catch (Exception e) {
  1052 + ExceptionUtils.catchException(e,"handlRiskChu error.");
1055 1053 }
1056 1054  
1057 1055 Risks risks = new Risks();
1058 1056  
... ... @@ -1066,9 +1064,11 @@
1066 1064 } catch (Exception e) {
1067 1065 ERROR_LOGGER.error("convert high risk error." + list2, e);
1068 1066 }
1069   - if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
  1067 +
  1068 + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
1070 1069 String otherHighRisk = antExChuModel.getOtherHighRisk();
1071 1070 List<Map> otherHighRisks = new ArrayList<>();
  1071 +
1072 1072 if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) {
1073 1073 list2 = JsonUtil.toList(otherHighRisk, Map.class);
1074 1074 otherHighRisks.addAll(list2);