From 3649b2cbf6e05476514f445b5bf998956f55a277 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 31 Aug 2016 17:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java | 2 +- .../java/com/lyms/platform/operate/web/result/MatDeliverListResult.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 4a0c944..80ed8a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -220,7 +220,7 @@ public class SieveFacade { sieveListResult.convertToResult(sieveModel); Patients patients= patientsService.findOnePatientById(sieveModel.getParentId()); if(null!=patients){ - sieveListResult.setIsGravida(patients.getType()==3?"0":"1"); + sieveListResult.setIsGravida(patients.getFmDate()!=null?"0":"1"); } data.add(sieveListResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index 933a9fd..f5edb1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -101,7 +101,7 @@ public class MatDeliverListResult { /* if (null != patients.getBuildType()) { setDueType(2 == patients.getBuildType() ? "1" : "0"); }*/ - setIsGravida(patients.getType()==3?"0":"1"); + setIsGravida(patients.getFmDate()!=null?"0":"1"); setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); -- 1.8.3.1