Commit de1aa3ce3bd3663616b5001a9720d73dfff51165
Exists in
master
and in
7 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
de1aa3c
| ... | ... | @@ -139,7 +139,7 @@ |
| 139 | 139 | archiveMap.put("certificateNum", archiveModel.getCertificateNum()); |
| 140 | 140 | archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); |
| 141 | 141 | archiveMap.put("username", archiveModel.getUsername()); |
| 142 | - archiveMap.put("age", archiveModel.getAge()); | |
| 142 | + archiveMap.put("age", DateUtil.getAge(archiveModel.getBirthday())); | |
| 143 | 143 | if (archiveModel.getSex()!=null){ |
| 144 | 144 | if (archiveModel.getSex().equals(SystemConfig.WOMAN_ID)){ |
| 145 | 145 | archiveMap.put("sex", "女"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
de1aa3c
| ... | ... | @@ -213,7 +213,7 @@ |
| 213 | 213 | |
| 214 | 214 | //历史建档记录 |
| 215 | 215 | Map<String,Object> mapData = new HashMap<>(); |
| 216 | - mapData.put("firstBuildData",newModel); | |
| 216 | + mapData.put("firstBuildData",getResult(newModel)); | |
| 217 | 217 | mapData.put("archiveHistory",resultList); |
| 218 | 218 | mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); |
| 219 | 219 | list.add(mapData); |
| 220 | 220 | |
| ... | ... | @@ -415,11 +415,11 @@ |
| 415 | 415 | //历史记录 |
| 416 | 416 | if (model!=null){ |
| 417 | 417 | ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); |
| 418 | - archiveQuery.setHospitalId(model.getHospitalId()); | |
| 419 | 418 | archiveQuery.setYn(YnEnums.YES.getId()); |
| 420 | 419 | if (StringUtils.isNotEmpty(model.getCertificateNum())){ |
| 421 | 420 | archiveQuery.setCertificateNum(model.getCertificateNum()); |
| 422 | 421 | }else if (StringUtils.isNotEmpty(model.getVcCardNo())){ |
| 422 | + archiveQuery.setHospitalId(model.getHospitalId()); | |
| 423 | 423 | archiveQuery.setVcCardNo(model.getVcCardNo()); |
| 424 | 424 | } |
| 425 | 425 | List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery); |
| ... | ... | @@ -451,6 +451,9 @@ |
| 451 | 451 | |
| 452 | 452 | public ResidentsArchiveResult getResult(ResidentsArchiveModel model){ |
| 453 | 453 | |
| 454 | + if (model==null){ | |
| 455 | + return null; | |
| 456 | + } | |
| 454 | 457 | ResidentsArchiveResult result = new ResidentsArchiveResult(); |
| 455 | 458 | result.setId(model.getId()); |
| 456 | 459 | result.setUsername(model.getUsername()); |