From 04941f22b04153f2282ea06c7151a0136b2a9d89 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Mon, 28 Feb 2022 17:33:47 +0800
Subject: [PATCH] update

---
 .../web/service/impl/PreEugebicsServiceImpl.java       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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<Integer> bdjc =null!= map.get("bdjc")?(List<Integer>) map.get("bdjc"):null;
+            List<String> bdjc =null!= map.get("bdjc")?(List<String>) 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<Integer> yigan =null!= map.get("yigan")?(List<Integer>) map.get("yigan"):null;
+            List<String> yigan =null!= map.get("yigan")?(List<String>) 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 <String, Object> map2=param.getHusbandClinicalCheck();
         if (map2 != null && map2.size() > 0) {
             //乙肝
-            List<Integer> yigan =null!= map2.get("yigan")?(List<Integer>) map2.get("yigan"):null;
+            List<String> yigan =null!= map2.get("yigan")?(List<String>) 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;
                     }
                 }
-- 
1.8.3.1