From 50688ff6aa9749087b4a21a7f32d14fca53c7caf Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 15 Jan 2020 16:21:47 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/CervicalCancerModel.java | 33 ------------ .../web/result/CervicalCancerModelResult.java | 34 ++++++++++++ .../service/impl/CervicalCancerServiceImpl.java | 62 ++++++++++++++++++++-- 3 files changed, 92 insertions(+), 37 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java index 14131d2..650857c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java @@ -46,13 +46,9 @@ public class CervicalCancerModel extends BaseModel { * 省市区街道 */ private String provinceId; - private String provinceStr; private String cityId; - private String cityStr; private String areaId; - private String areaStr; private String streetId; - private String streetStr; private String address; /** @@ -180,13 +176,6 @@ public class CervicalCancerModel extends BaseModel { this.provinceId = provinceId; } - public String getProvinceStr() { - return provinceStr; - } - - public void setProvinceStr(String provinceStr) { - this.provinceStr = provinceStr; - } public String getCityId() { return cityId; @@ -196,13 +185,6 @@ public class CervicalCancerModel extends BaseModel { this.cityId = cityId; } - public String getCityStr() { - return cityStr; - } - - public void setCityStr(String cityStr) { - this.cityStr = cityStr; - } public String getAreaId() { return areaId; @@ -212,14 +194,6 @@ public class CervicalCancerModel extends BaseModel { this.areaId = areaId; } - public String getAreaStr() { - return areaStr; - } - - public void setAreaStr(String areaStr) { - this.areaStr = areaStr; - } - public String getStreetId() { return streetId; } @@ -228,13 +202,6 @@ public class CervicalCancerModel extends BaseModel { this.streetId = streetId; } - public String getStreetStr() { - return streetStr; - } - - public void setStreetStr(String streetStr) { - this.streetStr = streetStr; - } public Date getLastMenstrual() { return lastMenstrual; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java index 1b48417..cefbfa4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java @@ -3,5 +3,39 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.pojo.CervicalCancerModel; public class CervicalCancerModelResult extends CervicalCancerModel { + private String addressStr; + /** + * 填写单位 + */ + private String hospitalStr; + + /** + * 填写人 + */ + private String createUserStr; + + public String getAddressStr() { + return addressStr; + } + + public void setAddressStr(String addressStr) { + this.addressStr = addressStr; + } + + public String getHospitalStr() { + return hospitalStr; + } + + public void setHospitalStr(String hospitalStr) { + this.hospitalStr = hospitalStr; + } + + public String getCreateUserStr() { + return createUserStr; + } + + public void setCreateUserStr(String createUserStr) { + this.createUserStr = createUserStr; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 20f7f33..6f23781 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -1,9 +1,16 @@ package com.lyms.platform.operate.web.service.impl; import java.util.Date; +import java.util.LinkedList; import java.util.List; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.result.PregnantDeathModelResult; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.PregnantDeathModel; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -42,6 +49,12 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private OrganizationService organizationService; + + @Autowired + private UsersService usersService; + /** * 保存单个 * @@ -118,12 +131,48 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { param.mysqlBuild((int) count); query.skip(param.getOffset()).limit(param.getLimit()); List cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class); + List results = new LinkedList<>(); + for (CervicalCancerModel model : cervicalCancerModels) { + CervicalCancerModelResult result = new CervicalCancerModelResult(); + getOtherStr(result, model); + results.add(result); + } + + BaseListResponse baseListResponse = new BaseListResponse(); baseListResponse.setData(cervicalCancerModels); baseListResponse.setPageInfo(param.getPageInfo()); return baseListResponse; } + + private void getOtherStr(CervicalCancerModelResult result, CervicalCancerModel model) { + BeanUtils.copyProperties(model, result); + + result.setAddressStr(CommonsHelper.getResidence( + result.getProvinceId(), + result.getCityId(), + result.getAreaId(), + result.getStreetId(), + null, + basicConfigService + )); + String createUser = result.getCreateUser(); + if (StringUtils.isNotEmpty(createUser)) { + Users users = usersService.getUsers(Integer.parseInt(createUser)); + if (users != null) { + result.setCreateUserStr(users.getName()); + } + } + String hospitalId = result.getHospitalId(); + if (StringUtils.isNotEmpty(hospitalId)) { + Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); + if (organization != null) { + result.setHospitalStr(organization.getName()); + } + } + } + /** * 单个查询 * @@ -169,16 +218,21 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { String provinceId = model.getProvinceId(); // 省市区 result.setProvinceId(provinceId); - result.setProvinceStr(CommonsHelper.getName1(provinceId, basicConfigService)); String cityId = model.getCityId(); result.setCityId(cityId); - result.setCityStr(CommonsHelper.getName1(cityId, basicConfigService)); String areaId = model.getAreaId(); result.setAreaId(areaId); - result.setAreaStr(CommonsHelper.getName1(areaId, basicConfigService)); String streetId = model.getStreetId(); result.setStreetId(streetId); - result.setStreetStr(CommonsHelper.getName1(streetId, basicConfigService)); + + result.setAddressStr(CommonsHelper.getResidence( + result.getProvinceId(), + result.getCityId(), + result.getAreaId(), + result.getStreetId(), + null, + basicConfigService + )); result.setLastMenstrual(model.getMcyj()); result.setName(model.getUsername()); -- 1.8.3.1