From a5f35ef2a59c29793c1752fb02d19fee2e16e4b2 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Mon, 17 Jun 2019 10:52:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=AD=95=E5=A6=87=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E9=9A=8F=E8=AE=BF=E6=9C=AC=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java | 4 ++-- .../java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 counts = queryRunner.query(conn, count, new BeanListHandler(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)); -- 1.8.3.1