diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
index 6820565..766f534 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
@@ -920,10 +920,10 @@ public class QhdfyHisService {
                 sql = hospitalizationNoSql + babyNameSql + finalDiagnosisSql + dischargeDateSql + birthDateSql;
             }
             String sqls = "select * from (select top 99999999 ROW_NUMBER() OVER(ORDER BY cyrq DESC ) " +
-                    "AS ROWID,blh,cyrq,hzxm,sex,birth,cyzdmc  from VW_LYMS_XSE_BRSYK where cyrq is not null " + sql + ") " +
+                    "AS ROWID,blh,cyrq,hzxm,sex,birth,cyzdmc  from VW_LYMS_XSE_BRSYK where cyrq is not null and mblh is null " + sql + ") " +
                     "AS TEMP where ROWID BETWEEN " + startPage + " and " + endlimit + " order by ROWID Asc";
 
-            String count = "select count(*) as tatalNum  from VW_LYMS_XSE_BRSYK where cyrq is not null" + sql + " ";
+            String count = "select count(*) as tatalNum  from VW_LYMS_XSE_BRSYK where cyrq is not null and mblh is null " + sql + " ";
             List<TatalNum> counts = queryRunner.query(conn, count, new BeanListHandler<TatalNum>(TatalNum.class));
 
             pageInfo.setCount(CollectionUtils.isNotEmpty(counts) ? counts.get(0).getTatalNum() : 0);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index 3751101..4c4aa08 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -867,7 +867,7 @@ public class MeasureInfoFacade {
         patInfo.put("userName", pat.getUsername());
         patInfo.put("age", DateUtil.getAge(pat.getBirth()) + "岁");
         patInfo.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), new Date()));
-        patInfo.put("dueDate", DateUtil.getyyyy_MM_dd(DateUtil.addDay(pat.getLastMenses(), 280)));
+        patInfo.put("dueDate", pat.getLastMenses() == null ? null : DateUtil.getyyyy_MM_dd(DateUtil.addDay(pat.getLastMenses(), 280)));
         patInfo.put("phone", pat.getPhone());
         patInfo.put("vcCardNo", pat.getVcCardNo());
         patInfo.put("certType", String.valueOf(certType));