shiyang / regional-platform

Authored by jiangjiazhi over 9 years ago

Showing 2 changed files with 17 additions and 4 deletions

...	...	@@ -19,6 +19,7 @@
19	19	import com.lyms.platform.query.*;
20	20	import org.apache.commons.collections.CollectionUtils;
21	21	import org.apache.commons.lang.StringUtils;
	22	+import org.apache.commons.lang.math.NumberUtils;
22	23	import org.springframework.beans.factory.annotation.Autowired;
23	24	import org.springframework.stereotype.Component;
24	25
25	26
...	...	@@ -537,7 +538,20 @@
537	538	babyList.add(maternalDeliverResult.new Baby(baby));
538	539	}
539	540	}
	541	+ Map<String,String> map1 =new HashMap<>();
	542	+ String fmHospital=deliverModel.getFmHospital();
540	543
	544	+ map1.put("id","-1");
	545	+ map1.put("name",fmHospital);
	546	+ if(NumberUtils.isNumber(fmHospital)){
	547	+ Organization organization= organizationService.getOrganization(Integer.valueOf(fmHospital));
	548	+ if(null!=organization){
	549	+ map1.put("id",organization.getId()+"");
	550	+ map1.put("name",organization.getName());
	551	+ }
	552	+ }
	553	+
	554	+ maternalDeliverResult.setFmHospital(map1);
541	555	maternalDeliverResult.setBabies(babyList);
542	556	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(maternalDeliverResult);
543	557	}

...	...	@@ -73,7 +73,7 @@
73	73
74	74	private List<Baby> babies;
75	75	//分娩医院
76		- private String fmHospital;
	76	+ private Map<String,String> fmHospital;
77	77	//接生医生
78	78	private Map<String,String> deliverDoctor;
79	79
...	...	@@ -107,7 +107,6 @@
107	107	setLoseBloodCause(JsonUtil.jkstr2Obj(destModel.getLoseBloodCause(), Map.class));
108	108	setOcs(JsonUtil.str2Obj(destModel.getOcs(), Map.class));
109	109	setExtPlacentas(destModel.getExtPlacentas());
110		- setFmHospital(destModel.getFmHospital());
111	110
112	111
113	112	return this;
114	113
...	...	@@ -360,11 +359,11 @@
360	359	this.dueWeek = dueWeek;
361	360	}
362	361
363		- public String getFmHospital() {
	362	+ public Map<String, String> getFmHospital() {
364	363	return fmHospital;
365	364	}
366	365
367		- public void setFmHospital(String fmHospital) {
	366	+ public void setFmHospital(Map<String, String> fmHospital) {
368	367	this.fmHospital = fmHospital;
369	368	}
370	369