diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java
index 30d7240..7ba0681 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java
@@ -116,16 +116,16 @@ public class ExpiryMap<K, V> extends HashMap<K, V>{
             expiryMap.put(e.getKey(), System.currentTimeMillis() + EXPIRY);
         super.putAll(m);
     }
-    public Set<Entry<K,V>> entrySet() {
-        Set<java.util.Map.Entry<K, V>> set = super.entrySet();
-        Iterator<Entry<K, V>> iterator = set.iterator();
-        while (iterator.hasNext()) {
-            java.util.Map.Entry<K, V> entry = iterator.next();
-            if(checkExpiry(entry.getKey(), false)) iterator.remove();
-        }
-
-        return set;
-    }
+//    public Set<Entry<K,V>> entrySet() {
+//        Set<java.util.Map.Entry<K, V>> set = super.entrySet();
+//        Iterator<Entry<K, V>> iterator = set.iterator();
+//        while (iterator.hasNext()) {
+//            java.util.Map.Entry<K, V> entry = iterator.next();
+//            if(checkExpiry(entry.getKey(), false)) iterator.remove();
+//        }
+//
+//        return set;
+//    }
     /**
      *
      * @Description: 是否过期
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PelvicFloorController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PelvicFloorController.java
index 86b00e0..3ba24f2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PelvicFloorController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PelvicFloorController.java
@@ -5,6 +5,7 @@ import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.result.BaseResponse;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.request.AfterVisitPelvicFloorRequest;
 import com.lyms.platform.operate.web.request.AfterVisitPelvicFloorUpdateRequest;
 import com.lyms.platform.operate.web.request.PelvicFloorInfoListRequest;
@@ -45,7 +46,7 @@ public class PelvicFloorController extends BaseController {
     private BaseResponse query(@RequestBody JSONObject jsonObject,  HttpServletRequest request) {
         String queryNo = jsonObject.getString("queryNo");
         String patientIdCard = jsonObject.getString("patientIdCard");
-        if (Objects.isNull(queryNo) && Objects.isNull(patientIdCard)) {
+        if (StringUtils.isNotEmpty(queryNo) && StringUtils.isNotEmpty(patientIdCard)) {
             return new BaseResponse("参数缺失", ErrorCodeConstants.PARAMETER_ERROR);
         }
         return pelvicFloorService.query(jsonObject, getUserId(request));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java
index d3db2fe..1c893f2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java
@@ -17,7 +17,6 @@ import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index e3a7543..3c6d337 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -1,10 +1,8 @@
 package com.lyms.platform.operate.web.facade;
 
 import com.lyms.hospitalapi.dzfy.DzfyHisService;
-import com.lyms.platform.biz.dal.IFolicAcidDao;
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
-import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
@@ -13,7 +11,6 @@ import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.request.AntExAddRequest;
 import com.lyms.platform.operate.web.request.AntExManagerQueryRequest;
 import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
-import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
 import com.lyms.platform.operate.web.result.AntExManagerResult;
 import com.lyms.platform.operate.web.result.CjStatisticsListResult;
 import com.lyms.platform.operate.web.result.CjStatisticsResult;
@@ -27,7 +24,6 @@ import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.permission.service.impl.MeasureDataInfoServiceImpl;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
-import jdk.nashorn.internal.ir.LiteralNode;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.math.NumberUtils;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java
index 5afc34b..dc76f39 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java
@@ -94,9 +94,28 @@ public class BabyAfterVisitInfoModelWork implements Callable<List<BabyAfterVisit
                     boolean notEmpty = CollectionUtils.isNotEmpty(babyEyeChecks);
                     if (notEmpty) {
                         BabyEyeCheck babyEyeCheck = babyEyeChecks.get(0);
-                        if (Objects.nonNull(babyEyeCheck)) {
+                        if (babyEyeCheck != null) {
                             List<String> projectStrs = InitDataUtils.getPositiveProjectByKey(babyEyeCheck);
-                            babyAfterVisitInfoModel.setPositiveProject(String.join(",", projectStrs));
+
+                            StringBuffer sb = new StringBuffer();
+                            if (CollectionUtils.isNotEmpty(projectStrs))
+                            {
+                                for (int i = 0;i < projectStrs.size() ; i++)
+                                {
+                                    if (i == projectStrs.size() -1)
+                                    {
+                                        sb.append(projectStrs.get(i));
+                                    }
+                                    else
+                                    {
+                                        sb.append(projectStrs.get(i));
+                                        sb.append(",");
+                                    }
+                                }
+                            }
+
+
+                            babyAfterVisitInfoModel.setPositiveProject(sb.toString());
                             babyAfterVisitInfoModel.setCreateTime(new Date());
                             babyAfterVisitInfoModel.setCheckDoctor(babyEyeCheck.getOperaterId());
                             //BeanUtils.copyProperties(babyEyeCheck, babyAfterVisitInfoModel);