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 88afdcb..cd71f49 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 @@ -137,7 +137,13 @@ public class PremaritalCheckupFacade { archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); archiveMap.put("username", archiveModel.getUsername()); archiveMap.put("age", archiveModel.getAge()); - archiveMap.put("sex", archiveModel.getSex()); + if (archiveModel.getSex()!=null){ + if (archiveModel.getSex()==SystemConfig.WOMAN_ID){ + archiveMap.put("sex", "女"); + }else if (archiveModel.getSex()==SystemConfig.MAN_ID){ + archiveMap.put("sex", "男"); + } + } archiveMap.put("birthday", getBirthday(archiveModel.getBirthday())); archiveMap.put("phone", archiveModel.getPhone()); archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), @@ -175,7 +181,13 @@ public class PremaritalCheckupFacade { checkupResult.setParentId(result.getId()); checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime())); checkupResult.setPublishId(result.getPublishId()); - checkupResult.setHospitalId(result.getHospitalId()); + //查询的时候,返回医院的名称 + if (result.getHospitalId()!=null){ + Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId())); + if (organization!=null && organization.getYn()==YnEnums.YES.getId()){ + checkupResult.setHospitalId(organization.getName()); + } + } checkupResult.setCertificateNum(result.getCertificateNum()); checkupResult.setCertificateTypeId(result.getCertificateTypeId()); checkupResult.setVcCardNo(result.getVcCardNo());