Commit 04941f22b04153f2282ea06c7151a0136b2a9d89
1 parent
33f36e5e13
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 9 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
04941f2
| ... | ... | @@ -353,21 +353,21 @@ |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | //白带检查 |
| 356 | - List<Integer> bdjc =null!= map.get("bdjc")?(List<Integer>) map.get("bdjc"):null; | |
| 356 | + List<String> bdjc =null!= map.get("bdjc")?(List<String>) map.get("bdjc"):null; | |
| 357 | 357 | int bdjcYn=CollectionUtils.isNotEmpty(bdjc)?1:0; |
| 358 | 358 | if(bdjcYn==1) { |
| 359 | - for (Integer s : bdjc) { | |
| 360 | - if (null == s || -1 == s) { | |
| 359 | + for (String s : bdjc) { | |
| 360 | + if (StringUtils.isEmpty(s) || "-1".equals(s)) { | |
| 361 | 361 | bdjcYn = 0; |
| 362 | 362 | } |
| 363 | 363 | } |
| 364 | 364 | } |
| 365 | 365 | //乙肝 |
| 366 | - List<Integer> yigan =null!= map.get("yigan")?(List<Integer>) map.get("yigan"):null; | |
| 366 | + List<String> yigan =null!= map.get("yigan")?(List<String>) map.get("yigan"):null; | |
| 367 | 367 | int yiganYn=CollectionUtils.isNotEmpty(yigan)?1:0; |
| 368 | 368 | if(yiganYn==1) { |
| 369 | - for (Integer s : yigan) { | |
| 370 | - if (null == s || -1 == s) { | |
| 369 | + for (String s : yigan) { | |
| 370 | + if (StringUtils.isEmpty(s) || "-1".equals(s)) { | |
| 371 | 371 | yiganYn = 0; |
| 372 | 372 | } |
| 373 | 373 | } |
| 374 | 374 | |
| ... | ... | @@ -403,11 +403,11 @@ |
| 403 | 403 | Map <String, Object> map2=param.getHusbandClinicalCheck(); |
| 404 | 404 | if (map2 != null && map2.size() > 0) { |
| 405 | 405 | //乙肝 |
| 406 | - List<Integer> yigan =null!= map2.get("yigan")?(List<Integer>) map2.get("yigan"):null; | |
| 406 | + List<String> yigan =null!= map2.get("yigan")?(List<String>) map2.get("yigan"):null; | |
| 407 | 407 | int yiganYn=CollectionUtils.isNotEmpty(yigan)?1:0; |
| 408 | 408 | if(yiganYn==1) { |
| 409 | - for (Integer s : yigan) { | |
| 410 | - if (null == s || -1 == s) { | |
| 409 | + for (String s : yigan) { | |
| 410 | + if (StringUtils.isEmpty(s) || "-1".equals(s)) { | |
| 411 | 411 | yiganYn = 0; |
| 412 | 412 | } |
| 413 | 413 | } |