From b074f2c764641fbcf2bdd64fee49b793a09eddbe Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 4 Jun 2018 16:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=95=B0=E6=8D=AE=E6=B5=81?= =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/biz/service/PatientsService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 776b80b..5efd640 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -249,7 +249,7 @@ public class PatientsService { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setDueStatus(0); patientsQuery.setType(1); - + System.out.println("查询出满足预产期前两周的孕妇："+patientsQuery.convertToQuery().convertToMongoQuery()); List patientses = iPatientDao.queryPatient(patientsQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(patientses)) { logger.info("处理预产期前两周的孕妇数据，进入分娩住院追访 size:" + patientses.size()); @@ -261,7 +261,7 @@ public class PatientsService { downRecordQuery.setParentId(trackDownRecord.getParentId()); List records = trackDownRecordService.queryTrackDown(downRecordQuery); //不存在追访或者追访未结束流程并且追访类型小于分娩住院 - if (CollectionUtils.isEmpty(records) || (records.get(0).getStatus() == 1 && records.get(0).getTrackType() < TrackDownDateEnums.E.getId())) { + if (CollectionUtils.isEmpty(records) || (records.get(0).getStatus() == 1 && ((records.get(0).getTrackType()==TrackDownDateEnums.H.getId()|| records.get(0).getTrackType()==TrackDownDateEnums.I.getId()))|| records.get(0).getTrackType() < TrackDownDateEnums.E.getId())) { trackDownRecord.setHospitalId(patient.getHospitalId()); trackDownRecord.setSource(patient.getId()); trackDownRecord.setStatus(1); -- 1.8.3.1