From 1bbd98844934c48e46a4ade60bf1c53ead76f384 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 12 Nov 2016 09:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/data/service/impl/SmsServiceImpl.java | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index a1ae51d..0c58ca6 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -2242,29 +2242,32 @@ public class SmsServiceImpl implements SmsService{ antExChuQuery.setNextCheckTimeEnd(yuYueDate); antExChuQuery.setHospitalId(tempHid); List chus = antenatalExaminationService.queryAntExChu(antExChuQuery); - for (AntExChuModel chu : chus) + if (CollectionUtils.isNotEmpty(chus)) { - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setParentId(chu.getParentId()); - antExQuery.setYn(YnEnums.YES.getId()); + for (AntExChuModel chu : chus) + { + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setParentId(chu.getParentId()); + antExQuery.setYn(YnEnums.YES.getId()); - PatientsQuery patientQuery = new PatientsQuery(); - patientQuery.setYn(YnEnums.YES.getId()); - patientQuery.setType(1); - patientQuery.setId(chu.getParentId()); + PatientsQuery patientQuery = new PatientsQuery(); + patientQuery.setYn(YnEnums.YES.getId()); + patientQuery.setType(1); + patientQuery.setId(chu.getParentId()); - List patientses = patientsService.queryPatient(patientQuery); - if (CollectionUtils.isNotEmpty(patientses)) - { - //复诊不存在 才添加 - List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (!CollectionUtils.isNotEmpty(list)) + List patientses = patientsService.queryPatient(patientQuery); + if (CollectionUtils.isNotEmpty(patientses)) { - idset.add(chu.getParentId()); + //复诊不存在 才添加 + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + if (!CollectionUtils.isNotEmpty(list)) + { + idset.add(chu.getParentId()); + } + } } - } PatientsQuery patientQuery = new PatientsQuery(); -- 1.8.3.1