Commit 7605ca3ab53371f94323b60ecbc59841a9b47337
1 parent
8474ebd6de
Exists in
master
and in
2 other branches
解决高危风险因素等级非数组格式导致的空指针问题
Showing 2 changed files with 30 additions and 2 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
View file @
7605ca3
| ... | ... | @@ -44,6 +44,25 @@ |
| 44 | 44 | return null; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | + /** | |
| 48 | + * 档案信息高危风险因素等级RiskLevelId转List专用方法 | |
| 49 | + * @param patientRiskLevelId | |
| 50 | + * @return | |
| 51 | + */ | |
| 52 | + public static List<String> patientRiskLevelIdToList(String patientRiskLevelId){ | |
| 53 | + List<String> list = new ArrayList<>(); | |
| 54 | + if (StringUtils.isEmpty(patientRiskLevelId) || "[]".equals(patientRiskLevelId)) { | |
| 55 | + return list; | |
| 56 | + } | |
| 57 | + if(patientRiskLevelId.startsWith("[")){ | |
| 58 | + list = jkstr2Obj(patientRiskLevelId, List.class); | |
| 59 | + }else{ | |
| 60 | + list.add(patientRiskLevelId); | |
| 61 | + } | |
| 62 | + | |
| 63 | + return list; | |
| 64 | + } | |
| 65 | + | |
| 47 | 66 | // public static <T> T jkstr2List(String content, |
| 48 | 67 | // TypeReference<?> typeReference) { |
| 49 | 68 | // ObjectMapper objectMapper = new ObjectMapper(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java
View file @
7605ca3
| ... | ... | @@ -259,9 +259,18 @@ |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | List level = new ArrayList(); |
| 262 | - if (StringUtils.isNotEmpty(patients.getRiskLevelId())) { | |
| 262 | + if (StringUtils.isNotEmpty(patients.getRiskLevelId()) && !"[]".equals(patients.getRiskLevelId())) { | |
| 263 | 263 | try { |
| 264 | - List<String> list = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); | |
| 264 | + //riskLevelId可能为非数组格式，故写了一个特殊方法 | |
| 265 | + /* List<String> list = null; | |
| 266 | + if(patients.getRiskLevelId().startsWith("[")){ | |
| 267 | + list = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); | |
| 268 | + }else{ | |
| 269 | + list = new ArrayList<>(); | |
| 270 | + list.add(patients.getRiskLevelId()); | |
| 271 | + }*/ | |
| 272 | + List<String> list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId()); | |
| 273 | + | |
| 265 | 274 | for (String str : list) { |
| 266 | 275 | BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); |
| 267 | 276 | if (null != basicConfig) { |