diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index a1ac28d..09ded72 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -806,13 +806,18 @@ public class PatientFacade {
                         dueWeek = "已分娩";
                     } else {
                         int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate());
-                        String week = (days / 7) + "";
-                        int day = (days % 7);
-                        dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
+                        if (days > 7 * 42 - 1) {
+                            dueWeek = "已分娩";
+                        } else {
+                            String week = (days / 7) + "";
+                            int day = (days % 7);
+                            dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
+                        }
                     }
                 } catch (Exception e) {
                     // 什么都不干
                 }
+                patientManagerQueryModel.setCardNo(DefenceUtils.getId(patients.getCardNo()));
                 patientManagerQueryModel.setBuildWeek(dueWeek);
                 patientManagerQueryModel.setBookbuildingDoctor(StringUtils.isEmpty(patients.getBookbuildingDoctor()) ? "" : usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor())).getName());
                 patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));