Commit eadfa690080f4e5881ddd1b4ba0726dadd112a9c
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
View file @
eadfa69
| ... | ... | @@ -83,6 +83,8 @@ |
| 83 | 83 | Users users = usersService.getUsers(userId); |
| 84 | 84 | if (users!=null && users.getYn()!=YnEnums.NO.getId()){ |
| 85 | 85 | model.setPublishName(users.getName()); |
| 86 | + //建档医生 | |
| 87 | + model.setBuildDoctor(users.getName()); | |
| 86 | 88 | } |
| 87 | 89 | model.setHospitalId(hospitalId); |
| 88 | 90 | |
| ... | ... | @@ -92,6 +94,9 @@ |
| 92 | 94 | model.setBirthday(addRequest.getBirthday()); |
| 93 | 95 | model.setAge(addRequest.getAge()); |
| 94 | 96 | model.setPhone(addRequest.getPhone()); |
| 97 | + | |
| 98 | + model.setSex(SystemConfig.WOMAN_ID); | |
| 99 | + | |
| 95 | 100 | ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); |
| 96 | 101 | |
| 97 | 102 | id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId()); |
| ... | ... | @@ -186,6 +191,7 @@ |
| 186 | 191 | archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), |
| 187 | 192 | archiveModel.getAddressRegister(), basicConfigService)); |
| 188 | 193 | archiveMap.put("workUnit",archiveModel.getWorkUnit()); |
| 194 | + archiveMap.put("buildDay",archiveModel.getBuildDay()); | |
| 189 | 195 | |
| 190 | 196 | } |
| 191 | 197 | resultMap.put("folicAcidResult",folicAcid); |
| ... | ... | @@ -252,7 +258,6 @@ |
| 252 | 258 | if (CollectionUtils.isNotEmpty(folicAcidList)){ |
| 253 | 259 | for (FolicAcid data : folicAcidList){ |
| 254 | 260 | Map<String,Object> map = new HashMap<>(); |
| 255 | - map.put("id",data.getId()); | |
| 256 | 261 | map.put("id",data.getId()); |
| 257 | 262 | ResidentsArchiveModel model = residentsArchiveService.getResident(data.getParentId()); |
| 258 | 263 | map.put("username",model.getUsername()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
eadfa69
| ... | ... | @@ -484,7 +484,7 @@ |
| 484 | 484 | map.put("id",model.getId()); |
| 485 | 485 | map.put("username",model.getUsername()); |
| 486 | 486 | map.put("certificateNum",model.getCertificateNum()); |
| 487 | - map.put("age",model.getAge()); | |
| 487 | + map.put("age",DateUtil.getAge(DateUtil.parseYMD(model.getBirthday()))); | |
| 488 | 488 | map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); |
| 489 | 489 | map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId())); |
| 490 | 490 | map.put("phone",model.getPhone()); |