From b6fcc4ac3fe12b7da473193ced1e030749b368b6 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 10 Oct 2018 21:07:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/PremaritalCheckupFacade.java | 75 ++++++++++++++-------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index c2512bd..486d9d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -170,10 +170,21 @@ public class PremaritalCheckupFacade { archiveMap.put("workUnit", archiveModel.getWorkUnit()); archiveMap.put("buildDay", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); + //户籍地址 + String hjSheng = CommonsHelper.getName1(archiveModel.getProvinceId(), basicConfigService); + String hjShi = CommonsHelper.getName1(archiveModel.getCityId(), basicConfigService); + String hjXian = CommonsHelper.getName1(archiveModel.getAreaId(), basicConfigService); + String hjXiang = CommonsHelper.getName1(archiveModel.getStreetId(), basicConfigService); + //String hQuan = hjSheng+hjShi+hjXian+hjXiang; + //增加返回基本信息字段（gxk） archiveMap.put("nation",FunvCommonUtil.getBaseicConfigByid(archiveModel.getLevelTypeId(), basicConfigService)); - archiveMap.put("address",CommonsHelper.getResidence(archiveModel.getProvinceId(),archiveModel.getCityId(), - archiveModel.getAreaId(),archiveModel.getStreetId(),archiveModel.getAddress(),basicConfigService)); + archiveMap.put("address",CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(), + archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService)); + archiveMap.put("hjSheng",hjSheng); + archiveMap.put("hjShi",hjShi); + archiveMap.put("hjXian",hjXian); + archiveMap.put("hjXiang",hjXiang); } @@ -475,28 +486,32 @@ public class PremaritalCheckupFacade { for (PremaritalCheckup checkup : data) { Map map = new HashMap<>(); ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId()); - map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime())); - map.put("username", model.getUsername()); - map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum())); - map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); - if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) { - map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle()); - } else { - map.put("jianChaJieGuo", checkup.getJianChaDetails()); - } - map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle()); - map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), - model.getAddress(), basicConfigService)); - - String hunJianDoctor = ""; - if (checkup.getHunJianDoctor()!=null){ - Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor())); - if (users!=null && users.getYn()==YnEnums.YES.getId()){ - hunJianDoctor = users.getName(); + if(null != model){ + map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime())); + map.put("username", model.getUsername()); + map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum())); + map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); + if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) { + map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle()); + } else { + map.put("jianChaJieGuo", checkup.getJianChaDetails()); + } + map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle()); + map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), + model.getAddress(), basicConfigService)); + + String hunJianDoctor = ""; + if (checkup.getHunJianDoctor()!=null){ + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + hunJianDoctor = users.getName(); + } } + map.put("hunJianDoctor", hunJianDoctor); + map.put("id", checkup.getId()); + }else{ + continue; } - map.put("hunJianDoctor", hunJianDoctor); - map.put("id", checkup.getId()); list.add(map); } } @@ -2286,7 +2301,11 @@ public class PremaritalCheckupFacade { gaowan = "未扪及"+"(左 "+zuo + "/右 "+you+")"; } } - checkupResult.setGaoWan(gaowan); + + if (result.getGaoWan() != null) { + checkupResult.setGaoWan(result.getGaoWan().toString()); + } + //附睾 String fugao = ""; @@ -2318,7 +2337,10 @@ public class PremaritalCheckupFacade { jingMai = "有"+"(左 "+zuo + "/右 "+you+")"; } } - checkupResult.setJingMai(jingMai); + if(result.getJingMai() != null){ + checkupResult.setJingMai(result.getJingMai().toString()); + } + checkupResult.setShengZhiQiTa(result.getShengZhiQiTa()); //女性生殖器 @@ -2428,7 +2450,10 @@ public class PremaritalCheckupFacade { yxyj = result.getYiJianQiTaDetails(); } } - checkupResult.setYiXueYiJian(yxyj); + if (result.getYiXueYiJian() != null){ + checkupResult.setYiXueYiJian(result.getYiXueYiJian().toString()); + } + checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian()); //新增 -- 1.8.3.1