From 9d05de0c186d6c0b4eefbfb6ed05153b1e5917fe Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 1 Jun 2016 15:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=85=8D=E5=B0=8F?= =?UTF-8?q?=E5=AD=A9=E7=9A=84=E7=A4=BE=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataImportTaskServiceImpl.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java index 0240083..e9775f9 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java @@ -552,6 +552,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { boolean isMatch = Boolean.FALSE; String areaid = key.next(); patientsQuery.setAreaIdOrRestId(areaid); + //分配产妇 List pat = patientsService.queryPatient(patientsQuery); for (Patients patients : pat) { //优先产后修养地,然后现住地址 @@ -596,6 +597,36 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { isMatch = Boolean.FALSE; } } + //分配小孩 + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setIsNull(true); + babyModelQuery.setAreaId(areaid); + List babyModels = babyService.queryBabyWithQuery(babyModelQuery); + if(CollectionUtils.isNotEmpty(babyModels)){ + for(BabyModel babyModel:babyModels){ + boolean chridMatch=false; + if (StringUtils.isNotBlank(babyModel.getAddress()) && StringUtils.isNotBlank(babyModel.getAreaId())) { + List communityList = map.get(babyModel.getAreaId()); + if (CollectionUtils.isNotEmpty(communityList)) { + for (SimpleCommunity community : communityList) { + for (String str : community.getGxxq()) { + if (babyModel.getAddress().indexOf(str) > -1) { + babyModel.setCommunityId(community.getId()); + chridMatch = true; + break; + } + } + } + } + } + if(chridMatch){ + BabyModelQuery babyModelQuery1 =new BabyModelQuery(); + babyModelQuery1.setId(babyModel.getId()); + babyService.findAndModify(babyModelQuery1.convertToQuery(), babyModel); + } + } + } } } -- 1.8.3.1