diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
index 2b09344..e0e42c2 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
@@ -158,17 +158,17 @@ public final class StringUtils {
     public static String encryCardNo(String id) {
         if (org.apache.commons.lang.StringUtils.isEmpty(id)) {
             return "";
-        }
-        if (id.length() == 11) {
+        }else if (id.length() == 11) {
             return id.substring(0, 3) + "****" + id.substring(7);
-        }
-        if (id.length() == 15) {
+        }else if (id.length() == 15) {
             return id.substring(0, 6) + "****" + id.substring(10, 13) + "*" + id.substring(14);
-        }
-        if (id.length() == 18) {
+        }else if (id.length() == 18) {
             return id.substring(0, 6) + "******" + id.substring(12, 15) + "**" + id.substring(17);
+        }else if(id.length()<11){
+            return id;
+        }else{
+            return id.substring(0, 6) + "******" + id.substring(12, 15) + "**" + id.substring(id.length());
         }
-        return "";
     }
 
     public static Date getBirthDay(String idCard){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
index 1a3a0bd..0ac72ca 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
@@ -146,10 +146,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                     temp.put("fmType", patients.getFmType()); // 分娩方式 1： 顺产，2：剖宫产
                 }
 
-
-                AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
-                antExRecordQuery.setParentId(patients.getId());
-                temp.put("yjcount", recordService.count(antExRecordQuery)); // 孕检次数
+                //孕检次数
+                temp.put("yjcount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patients.getId()).and("hospitalId").and("yn").is(1)), AntenatalExaminationModel.class) + mongoTemplate.count(Query.query(Criteria.where("parentId").is(patients.getId()).and("yn").is(1)), AntExChuModel.class));
                 if (patients.getType() == 3) {
                     //产后复查
                     PostReviewQuery postReviewQuery = new PostReviewQuery();
@@ -228,9 +226,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                 temp.put("fmType", patient.getFmType()); // 分娩方式 1： 顺产，2：剖宫产
             }
 
-            AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
-            antExRecordQuery.setParentId(patient.getId());
-            temp.put("yjcount", recordService.count(antExRecordQuery)); // 孕检次数
+            //孕检次数
+            temp.put("yjcount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("hospitalId").and("yn").is(1)), AntenatalExaminationModel.class) + mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("yn").is(1)), AntExChuModel.class));
 
             if(patient.getType() == 3){//分娩后
                 //产后复查