Commit 9d05de0c186d6c0b4eefbfb6ed05153b1e5917fe
1 parent
fd38e3afd8
Exists in
master
and in
8 other branches
增加分配小孩的社区
Showing 1 changed file with 31 additions and 0 deletions
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java
View file @
9d05de0
| ... | ... | @@ -552,6 +552,7 @@ |
| 552 | 552 | boolean isMatch = Boolean.FALSE; |
| 553 | 553 | String areaid = key.next(); |
| 554 | 554 | patientsQuery.setAreaIdOrRestId(areaid); |
| 555 | + //分配产妇 | |
| 555 | 556 | List<Patients> pat = patientsService.queryPatient(patientsQuery); |
| 556 | 557 | for (Patients patients : pat) { |
| 557 | 558 | //优先产后修养地,然后现住地址 |
| ... | ... | @@ -594,6 +595,36 @@ |
| 594 | 595 | babyModel.setCommunityId(patients.getCommunityId()); |
| 595 | 596 | babyService.findAndModify(babyModelQuery.convertToQuery(), babyModel); |
| 596 | 597 | isMatch = Boolean.FALSE; |
| 598 | + } | |
| 599 | + } | |
| 600 | + //分配小孩 | |
| 601 | + BabyModelQuery babyModelQuery = new BabyModelQuery(); | |
| 602 | + babyModelQuery.setYn(YnEnums.YES.getId()); | |
| 603 | + babyModelQuery.setIsNull(true); | |
| 604 | + babyModelQuery.setAreaId(areaid); | |
| 605 | + List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery); | |
| 606 | + if(CollectionUtils.isNotEmpty(babyModels)){ | |
| 607 | + for(BabyModel babyModel:babyModels){ | |
| 608 | + boolean chridMatch=false; | |
| 609 | + if (StringUtils.isNotBlank(babyModel.getAddress()) && StringUtils.isNotBlank(babyModel.getAreaId())) { | |
| 610 | + List<SimpleCommunity> communityList = map.get(babyModel.getAreaId()); | |
| 611 | + if (CollectionUtils.isNotEmpty(communityList)) { | |
| 612 | + for (SimpleCommunity community : communityList) { | |
| 613 | + for (String str : community.getGxxq()) { | |
| 614 | + if (babyModel.getAddress().indexOf(str) > -1) { | |
| 615 | + babyModel.setCommunityId(community.getId()); | |
| 616 | + chridMatch = true; | |
| 617 | + break; | |
| 618 | + } | |
| 619 | + } | |
| 620 | + } | |
| 621 | + } | |
| 622 | + } | |
| 623 | + if(chridMatch){ | |
| 624 | + BabyModelQuery babyModelQuery1 =new BabyModelQuery(); | |
| 625 | + babyModelQuery1.setId(babyModel.getId()); | |
| 626 | + babyService.findAndModify(babyModelQuery1.convertToQuery(), babyModel); | |
| 627 | + } | |
| 597 | 628 | } |
| 598 | 629 | } |
| 599 | 630 | } |