From 03da858af0af49f7699b66b6966ad1e19cdbc639 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 31 May 2016 18:01:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/data/service/impl/DataImportTaskServiceImpl.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 f3b43b9..289664e 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
@@ -478,7 +478,8 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                 continue;
             }
             if (CollectionUtils.isNotEmpty(config.getAreas())) {
-                String areaId = config.getAreas().get(config.getAreas().size() - 1);
+                int size = config.getAreas().size() >= 3 ? 2 : config.getAreas().size() - 1;
+                String areaId = config.getAreas().get(size);
                 //查看map里面是否存在该区域
                 if (listMap.containsKey(areaId)) {
                     List<SimpleCommunity> list = listMap.get(areaId);
@@ -569,7 +570,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                     }
 
                 }
-                if (!isMatch&&StringUtils.isNotBlank(patients.getAddress()) && StringUtils.isNotBlank(patients.getAreaId()) ) {
+                if (!isMatch && StringUtils.isNotBlank(patients.getAddress()) && StringUtils.isNotBlank(patients.getAreaId())) {
                     List<SimpleCommunity> communityList = map.get(patients.getAreaId());
                     if (CollectionUtils.isNotEmpty(communityList)) {
                         for (SimpleCommunity community : communityList) {
@@ -583,7 +584,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                         }
                     }
                 }
-                if (isMatch){
+                if (isMatch) {
                     patientsService.updatePatient(patients);
                     //修改产妇下面的小孩信息
                     BabyModelQuery babyModelQuery = new BabyModelQuery();
@@ -591,7 +592,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                     babyModelQuery.setParentId(patients.getId());
                     BabyModel babyModel = new BabyModel();
                     babyModel.setCommunityId(patients.getCommunityId());
-                    babyService.findAndModify(babyModelQuery.convertToQuery(),babyModel);
+                    babyService.findAndModify(babyModelQuery.convertToQuery(), babyModel);
                     isMatch = Boolean.FALSE;
                 }
             }
-- 
1.8.3.1