From f7debdb9425f8c621de351b3d1f70e496a34b5c8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 16 Jun 2017 14:53:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ResidentsArchiveFacade.java | 41 ++++++++++++---------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index bf7d0c1..f58fb5d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -28,6 +28,7 @@ import com.lyms.platform.query.PremaritalCheckupQuery; import com.lyms.platform.query.ResidentsArchiveQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -486,29 +487,33 @@ public class ResidentsArchiveFacade{ result.setStreetRegisterId(model.getStreetRegisterId()); result.setAddressRegister(model.getAddressRegister()); - result.setPastHistory(model.getPastHistory()==null ? null :JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class)); + result.setPastHistory(model.getPastHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class)); result.setFamilyHistory(model.getFamilyHistory() == null ? null : JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class)); - result.setPersonalHistory(model.getPersonalHistory() == null ? null :JsonUtil.jkstr2Obj(model.getPersonalHistory(), Map.class)); - result.setYwgmHistory(model.getYwgmHistory() == null ? null :JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class)); - result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class)); + result.setPersonalHistory(model.getPersonalHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPersonalHistory(), Map.class)); + result.setYwgmHistory(model.getYwgmHistory() == null ? null : JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class)); + result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class)); result.setVcCardNo(model.getVcCardNo()); - if (StringUtils.isNotEmpty( model.getBuildDoctor())){ - Users u = usersService.getUsers(Integer.valueOf(model.getBuildDoctor())); - if(u!=null){ - Map doctInfo = new HashMap<>(); - doctInfo.put("id",String.valueOf(u.getId())); - doctInfo.put("name",u.getName()); - result.setBuildDoctor(doctInfo); - }else{ - Map doctInfo = new HashMap<>(); - doctInfo.put("id",String.valueOf(u.getId())); + + Map doctInfo = new HashMap<>(); + doctInfo.put("id", String.valueOf(model.getBuildDoctor())); + doctInfo.put("name", String.valueOf(model.getBuildDoctor())); + result.setBuildDoctor(doctInfo); + + if (StringUtils.isNotEmpty(model.getBuildDoctor())){ + if(org.apache.commons.lang.math.NumberUtils.isNumber(model.getBuildDoctor())){ + Users u = usersService.getUsers(Integer.valueOf(model.getBuildDoctor())); + if(u!=null){ + doctInfo.put("id",String.valueOf(u.getId())); + doctInfo.put("name",u.getName()); + result.setBuildDoctor(doctInfo); + } + } + else{ + doctInfo.put("id","-1"); + doctInfo.put("name",model.getBuildDoctor()); result.setBuildDoctor(doctInfo); } - }else{ - Map doctInfo = new HashMap<>(); - doctInfo.put("id",String.valueOf(model.getBuildDoctor())); - result.setBuildDoctor(doctInfo); } -- 1.8.3.1