From d8910b7b8ab52d1daebdd170bccd6a62e5f4aadf Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 13 Jul 2016 17:16:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 4 ++-- .../com/lyms/platform/operate/web/result/PatientBaseResult.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index d684fcf..a43e0e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -186,7 +186,7 @@ public class AntenatalExaminationFacade { MaternalDeliverModel model = modelList.get(0); dueDate = model.getDueDate(); } - PostReviewQuery postReviewQuery = null; + PostReviewQuery postReviewQuery = new PostReviewQuery();; if (StringUtils.isNotEmpty(dueDate)) { Date date = DateUtil.parseYMD(dueDate); //初诊记录 @@ -215,7 +215,7 @@ public class AntenatalExaminationFacade { data.add(new AntData(an, null != organization ? organization.getName() : "")); } } - postReviewQuery = new PostReviewQuery(); + postReviewQuery.setYn(YnEnums.YES.getId()); if (list.size() - 1 > i) { postReviewQuery.setStart(date); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index 12c2d37..785ba1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -122,12 +122,12 @@ public class PatientBaseResult { setRemarks(patients.getMremark()); setRiskScore("60"); - int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); - String week= (days/7)+""; - int day = (days%7); - this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); if(null!=patients.getLastMenses()){ setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); + int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); + String week= (days/7)+""; + int day = (days%7); + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); } return this; } -- 1.8.3.1