jiangjiazhi / regional-platform

Download as
Browse Code »

Commit cd82f3a081218dd83eca0fe79147dc90eb1f3d3a

Authored by hujiaqi
2 parents de73724271 527bb27404
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ cd82f3a
... ... @@ -137,7 +137,13 @@
137 137 archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
138 138 archiveMap.put("username", archiveModel.getUsername());
139 139 archiveMap.put("age", archiveModel.getAge());
140   - archiveMap.put("sex", archiveModel.getSex());
  140 + if (archiveModel.getSex()!=null){
  141 + if (archiveModel.getSex().equals(SystemConfig.WOMAN_ID)){
  142 + archiveMap.put("sex", "女");
  143 + }else if (archiveModel.getSex().equals(SystemConfig.MAN_ID)){
  144 + archiveMap.put("sex", "男");
  145 + }
  146 + }
141 147 archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()));
142 148 archiveMap.put("phone", archiveModel.getPhone());
143 149 archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(),
... ... @@ -175,7 +181,13 @@
175 181 checkupResult.setParentId(result.getId());
176 182 checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
177 183 checkupResult.setPublishId(result.getPublishId());
178   - checkupResult.setHospitalId(result.getHospitalId());
  184 + //查询的时候,返回医院的名称
  185 + if (result.getHospitalId()!=null){
  186 + Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
  187 + if (organization!=null && organization.getYn()==YnEnums.YES.getId()){
  188 + checkupResult.setHospitalId(organization.getName());
  189 + }
  190 + }
179 191 checkupResult.setCertificateNum(result.getCertificateNum());
180 192 checkupResult.setCertificateTypeId(result.getCertificateTypeId());
181 193 checkupResult.setVcCardNo(result.getVcCardNo());