diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index 2856ff6..c0c2d91 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -83,6 +83,8 @@ public class FolicAcidFacade { Users users = usersService.getUsers(userId); if (users!=null && users.getYn()!=YnEnums.NO.getId()){ model.setPublishName(users.getName()); + //建档医生 + model.setBuildDoctor(users.getName()); } model.setHospitalId(hospitalId); @@ -92,6 +94,9 @@ public class FolicAcidFacade { model.setBirthday(addRequest.getBirthday()); model.setAge(addRequest.getAge()); model.setPhone(addRequest.getPhone()); + + model.setSex(SystemConfig.WOMAN_ID); + ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId()); @@ -186,6 +191,7 @@ public class FolicAcidFacade { archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService)); archiveMap.put("workUnit",archiveModel.getWorkUnit()); + archiveMap.put("buildDay",archiveModel.getBuildDay()); } resultMap.put("folicAcidResult",folicAcid); @@ -253,7 +259,6 @@ public class FolicAcidFacade { for (FolicAcid data : folicAcidList){ Map map = new HashMap<>(); map.put("id",data.getId()); - map.put("id",data.getId()); ResidentsArchiveModel model = residentsArchiveService.getResident(data.getParentId()); map.put("username",model.getUsername()); map.put("certificateNum",model.getCertificateNum()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index ee0af92..cc3f325 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -484,7 +484,7 @@ public class ResidentsArchiveFacade{ map.put("id",model.getId()); map.put("username",model.getUsername()); map.put("certificateNum",model.getCertificateNum()); - map.put("age",model.getAge()); + map.put("age",DateUtil.getAge(DateUtil.parseYMD(model.getBirthday()))); map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId())); map.put("phone",model.getPhone());