From dc1541b4ba11580846aad2d42dc83f4e4c5e0460 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Tue, 10 Jan 2017 17:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=AD=BB=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 4c63a32..caebf76 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1077,7 +1077,7 @@ public class MatDeliverFacade { patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId()) ? null : childbirthManagerRequest.getLivingAreaId()); patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo()); - // patientsQuery.setFmHospitalQueryList(hospitalList); + patientsQuery.setFmHospitalQueryList(hospitalList); String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode(); patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson); patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge())); @@ -1173,10 +1173,15 @@ public class MatDeliverFacade { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); babyModelQuery.setParentId(patients.getId()); - babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); if (CollectionUtils.isNotEmpty(babyModelList)) { - childbirthManagerQueryModel.setLivingNumber(babyModelList.size()); + int i = 0; + for (BabyModel babyModel : babyModelList) { + if (RenShenJieJuEnums.O.getId().equals(babyModel.getPregnancyOut())) { + i++; + } + } + childbirthManagerQueryModel.setLivingNumber(i); } else { if (childbirthManagerQueryModel.getTireNumber() == null) { childbirthManagerQueryModel.setLivingNumber(null); -- 1.8.3.1