Commit c488a41036aedc41407e9d73eee182e7e962a944
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
View file @
c488a41
| ... | ... | @@ -10,6 +10,7 @@ |
| 10 | 10 | import com.lyms.platform.common.result.BaseResponse; |
| 11 | 11 | import com.lyms.platform.common.utils.DateUtil; |
| 12 | 12 | import com.lyms.platform.common.utils.ExcelUtil; |
| 13 | +import com.lyms.platform.common.utils.SystemConfig; | |
| 13 | 14 | import com.lyms.platform.operate.web.request.FolicAcidAddRequest; |
| 14 | 15 | import com.lyms.platform.operate.web.request.FolicAcidQueryRequest; |
| 15 | 16 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 16 | 17 | |
| ... | ... | @@ -18,12 +19,14 @@ |
| 18 | 19 | import com.lyms.platform.permission.model.Users; |
| 19 | 20 | import com.lyms.platform.permission.service.OrganizationService; |
| 20 | 21 | import com.lyms.platform.permission.service.UsersService; |
| 22 | +import com.lyms.platform.pojo.BasicConfig; | |
| 21 | 23 | import com.lyms.platform.pojo.FolicAcid; |
| 22 | 24 | import com.lyms.platform.pojo.ResidentsArchiveModel; |
| 23 | 25 | import com.lyms.platform.query.FolicAcidQuery; |
| 24 | 26 | import com.lyms.platform.query.ResidentsArchiveQuery; |
| 25 | 27 | import org.apache.commons.collections.CollectionUtils; |
| 26 | 28 | import org.apache.commons.lang.StringUtils; |
| 29 | +import org.apache.struts.config.BaseConfig; | |
| 27 | 30 | import org.springframework.beans.factory.annotation.Autowired; |
| 28 | 31 | import org.springframework.stereotype.Component; |
| 29 | 32 | |
| ... | ... | @@ -176,6 +179,15 @@ |
| 176 | 179 | archiveMap.put("age", archiveModel.getAge()); |
| 177 | 180 | archiveMap.put("phone", archiveModel.getPhone()); |
| 178 | 181 | archiveMap.put("id", archiveModel.getId()); |
| 182 | + if (archiveModel.getSex()== SystemConfig.WOMAN_ID){ | |
| 183 | + archiveMap.put("sex", "女"); | |
| 184 | + }else { | |
| 185 | + archiveMap.put("sex", "男"); | |
| 186 | + } | |
| 187 | + archiveMap.put("residenceRegister",CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), | |
| 188 | + archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), | |
| 189 | + archiveModel.getAddressRegister(), basicConfigService)); | |
| 190 | + archiveMap.put("workUnit",archiveModel.getWorkUnit()); | |
| 179 | 191 | |
| 180 | 192 | } |
| 181 | 193 | resultMap.put("folicAcidResult",folicAcid); |