diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index aec9479..9ddb0b3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -353,21 +353,21 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen } //白带检查 - List bdjc =null!= map.get("bdjc")?(List) map.get("bdjc"):null; + List bdjc =null!= map.get("bdjc")?(List) map.get("bdjc"):null; int bdjcYn=CollectionUtils.isNotEmpty(bdjc)?1:0; if(bdjcYn==1) { - for (Integer s : bdjc) { - if (null == s || -1 == s) { + for (String s : bdjc) { + if (StringUtils.isEmpty(s) || "-1".equals(s)) { bdjcYn = 0; } } } //乙肝 - List yigan =null!= map.get("yigan")?(List) map.get("yigan"):null; + List yigan =null!= map.get("yigan")?(List) map.get("yigan"):null; int yiganYn=CollectionUtils.isNotEmpty(yigan)?1:0; if(yiganYn==1) { - for (Integer s : yigan) { - if (null == s || -1 == s) { + for (String s : yigan) { + if (StringUtils.isEmpty(s) || "-1".equals(s)) { yiganYn = 0; } } @@ -403,11 +403,11 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen Map map2=param.getHusbandClinicalCheck(); if (map2 != null && map2.size() > 0) { //乙肝 - List yigan =null!= map2.get("yigan")?(List) map2.get("yigan"):null; + List yigan =null!= map2.get("yigan")?(List) map2.get("yigan"):null; int yiganYn=CollectionUtils.isNotEmpty(yigan)?1:0; if(yiganYn==1) { - for (Integer s : yigan) { - if (null == s || -1 == s) { + for (String s : yigan) { + if (StringUtils.isEmpty(s) || "-1".equals(s)) { yiganYn = 0; } }