Commit bed75002899942fcbe6bae2eb33cdd1c50db0929
1 parent
e65e085144
Exists in
master
and in
8 other branches
增加设置parentid
Showing 1 changed file with 17 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
bed7500
| ... | ... | @@ -236,7 +236,7 @@ |
| 236 | 236 | break; |
| 237 | 237 | } |
| 238 | 238 | //复诊 |
| 239 | - if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"{}".equals(model.getRiskFactor())) { | |
| 239 | + if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"[]".equals(model.getRiskFactor())) { | |
| 240 | 240 | List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); |
| 241 | 241 | highScoreResult = queryRisk(list1, needLevel); |
| 242 | 242 | next=false; |
| ... | ... | @@ -247,8 +247,14 @@ |
| 247 | 247 | //风险因素 |
| 248 | 248 | Map map1 = new HashMap(); |
| 249 | 249 | map1.put("id", ""); |
| 250 | - map1.put("name", map.get("fxysu")); | |
| 251 | - highScoreResult.getHighRisk().add(map1); | |
| 250 | + Object obj = map.get("fxysu"); | |
| 251 | + if(null!=obj&&!"null".equals(obj.toString())&&!"".equals(obj.toString())){ | |
| 252 | + map1.put("name", map.get("fxysu")); | |
| 253 | + highScoreResult.getHighRisk().add(map1); | |
| 254 | + }else { | |
| 255 | + continue; | |
| 256 | + } | |
| 257 | + | |
| 252 | 258 | //风险评分 |
| 253 | 259 | Object idObj = map.get("fxpf"); |
| 254 | 260 | if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) { |
| ... | ... | @@ -285,7 +291,7 @@ |
| 285 | 291 | if(!next){ |
| 286 | 292 | break; |
| 287 | 293 | } |
| 288 | - if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"{}".equals(antExChuModel.getHighrisk())) { | |
| 294 | + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) { | |
| 289 | 295 | List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); |
| 290 | 296 | highScoreResult = queryRisk(list2,true); |
| 291 | 297 | next=false; |
| ... | ... | @@ -295,8 +301,13 @@ |
| 295 | 301 | //风险因素 |
| 296 | 302 | Map map1 = new HashMap(); |
| 297 | 303 | map1.put("id", ""); |
| 298 | - map1.put("name", map.get("fxysu")); | |
| 299 | - highScoreResult.getHighRisk().add(map1); | |
| 304 | + Object obj = map.get("fxysu"); | |
| 305 | + if(null!=obj&&!"null".equals(obj.toString())&&!"".equals(obj.toString())){ | |
| 306 | + map1.put("name", map.get("fxysu")); | |
| 307 | + highScoreResult.getHighRisk().add(map1); | |
| 308 | + }else { | |
| 309 | + continue; | |
| 310 | + } | |
| 300 | 311 | //风险评分 |
| 301 | 312 | Object idObj = map.get("fxpf"); |
| 302 | 313 | if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) { |