jiangjiazhi / regional-platform

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 4 additions and 14 deletions

...	...	@@ -4988,6 +4988,8 @@
4988	4988	result.setPatientSerResults(patientSerResults);
4989	4989
4990	4990	result = result.convertToResult(model);
	4991	+ result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族
	4992	+ result.setEncoded(model.getEncoded());
4991	4993	result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
4992	4994	result.setBabyHighRiskReason(mongoUtil.findNames(model.getBabyHighRiskReason()));
4993	4995

...	...	@@ -1010,8 +1010,6 @@
1010	1010	@Override
1011	1011	public BabyPageResult convertToResult(BabyModel destModel) {
1012	1012	List<String> list = destModel.getmHighRiskReason();
1013		- setEncoded(destModel.getEncoded());
1014		- setBnationId(destModel.getBnationId() == null ? "" : getBasicConfig(destModel.getBnationId()));//民族
1015	1013	setId(destModel.getId());
1016	1014	setPid(destModel.getPid());
1017	1015	setBabyName(destModel.getName());
...	...	@@ -1132,17 +1130,7 @@
1132	1130	public void setCouponCode(String couponCode) {
1133	1131	this.couponCode = couponCode;
1134	1132	}
1135		- @Autowired
1136		- private BasicConfigService basicConfigService;
1137		- private String getBasicConfig(String id) {
1138		- if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) {
1139		- return "";
1140		- }
1141		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
1142		- if (null != basicConfig) {
1143		- return basicConfig.getName();
1144		- }
1145		- return "";
1146		- }
	1133	+
	1134	+
1147	1135	}