From 0ec26d146dcfe8f8b5449c4b7839eb0ad9ba13a4 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Thu, 11 Oct 2018 16:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/PremaritalCheckupFacade.java | 54 +++++++++++++++------- 1 file changed, 38 insertions(+), 16 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 324720c..9c692a2 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 @@ -994,6 +994,7 @@ public class PremaritalCheckupFacade { try { for (PremaritalCheckup checkup : data) { Map map = new HashMap<>(); + map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); if (checkup.getSexType() == one) { String username = ""; @@ -1002,6 +1003,7 @@ public class PremaritalCheckupFacade { String certificateTypeId = ""; String certificateNum = ""; String vcCardNo = ""; + String residence = ""; if (StringUtils.isNotEmpty(checkup.getParentId())){ ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId()); @@ -1011,14 +1013,43 @@ public class PremaritalCheckupFacade { certificateTypeId = archiveModel.getCertificateTypeId(); certificateNum = archiveModel.getCertificateNum(); vcCardNo = archiveModel.getVcCardNo(); + residence = CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), + archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService); if (archiveModel.getBirthday()!=null){ age = DateUtil.getAge(archiveModel.getBirthday()); } } } map.put("username", username); + map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); map.put("phone", phone); - map.put("age", age); + if(2 == checkup.getJianChaJieGuo()){ + map.put("jianChaJieGuo","正常"); + }else{ + map.put("jianChaJieGuo",checkup.getJianChaDetails()); + } + if (1 == checkup.getYiXueYiJian() ){ + map.put("yiXueYiJian", "未发现医学上不宜结婚的情形"); + }else if(2 == checkup.getYiXueYiJian()){ + map.put("yiXueYiJian", "建议暂缓结婚"); + }else if(3 == checkup.getYiXueYiJian()){ + map.put("yiXueYiJian", "建议不宜生育"); + }else if(4 == checkup.getYiXueYiJian()){ + map.put("yiXueYiJian", "建议不结婚"); + }else if(5 == checkup.getYiXueYiJian()){ + map.put("yiXueYiJian", "建议采取医学措施，尊重受检查者意愿"); + } + map.put("residence", residence); + 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("age", age); //医院名称 if (StringUtils.isNotEmpty(checkup.getHospitalId())) { @@ -1027,9 +1058,9 @@ public class PremaritalCheckupFacade { map.put("hospital", organization.getName()); } } - map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId)); - map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); + map.put("vcCardNo", vcCardNo); map.put("sexType", "女"); @@ -1196,23 +1227,14 @@ public class PremaritalCheckupFacade { map.put("linBing", checkup.getLinBing()); map.put("xiongTou", checkup.getXiongTou()); - map.put("jianChaJieGuo", FunvCommonUtil.havaOrNOInteger(checkup.getJianChaJieGuo(), two)); + map.put("jianChaDetails", checkup.getJianChaDetails()); map.put("jiBingZhenDuan", checkup.getJiBingZhenDuan()); - if (checkup.getYiXueYiJian()!=null){ - map.put("yiXueYiJian", MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle()); - } + map.put("yiJianQiTaDetails", checkup.getYiJianQiTaDetails()); - map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian()); - 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("zhiDaoYiJian", checkup.getZhiDaoYiJian());*/ + list.add(map); } } -- 1.8.3.1