diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java
index 6eb8a08..f905bfe 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java
@@ -55,7 +55,7 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie
 
         if(StringUtils.isNotEmpty(key)) {
             Criteria criteria = new Criteria();
-            criteria.orOperator(Criteria.where("username").is(key), Criteria.where("vcCardNo").is(key), Criteria.where("phone").is(key));
+            criteria.orOperator(Criteria.where("username").regex(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key));
             List<Patients> patients = mongoUtil.findField(Patients.class, criteria, "id");
             if(CollectionUtils.isEmpty(patients)) {
                 return RespBuilder.buildSuccess(new PageResult(0, page, limit, null));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index ffba734..4854c95 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -1217,16 +1217,36 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             }
         }
         System.out.println("===========");
-        for (Map.Entry<String, List<Map<String, Object>>> map : userCheckInfo.entrySet()) {
-            System.out.println(map.getKey() + " : " + map.getValue());
-        }
-
         Map<Integer, Integer> countMap = new HashMap<>();
         for (int i = 1; i < 14; i++) {
             countMap.put(i, 0);
         }
-        for (Map<String,Object> map : datas) {
-            
+        Set<Map.Entry<String, List<Map<String, Object>>>> entries = userCheckInfo.entrySet();
+        for (Map.Entry<String, List<Map<String, Object>>> entry : entries) {
+            List<Map<String, Object>> value = entry.getValue();
+            if(value.size() == 1) {
+                countMap.put(1, countMap.get(1) + 1);
+            } else {
+                /** 按照分娩时间分组 */
+                /** key=pid value=count */
+                Map<Date, Integer> tempMap = new HashMap<>();
+                Integer other = 0;
+                Date otherDate = new Date();
+                for (Map<String, Object> map : value) {
+                    Date fmDate = (Date) map.get("fmDate");
+                    if(fmDate == null) {
+                        ++other;
+                        continue;
+                    }
+                    if(tempMap.containsKey(fmDate)) {
+                        tempMap.put(fmDate, tempMap.get(fmDate) + 1);
+                    } else {
+                        tempMap.put(fmDate, 1);
+                    }
+                }
+                tempMap.put(otherDate, other);
+                System.out.println(">>> " + tempMap);
+            }
         }
 
         List<Map<String,Object>> restList = new ArrayList<>();