jiangjiazhi / regional-platform

Authored by hujiaqi over 8 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 30 additions and 12 deletions

...	...	@@ -1206,8 +1206,11 @@
1206	1206	matDeliverQuery.setParentId(babyModel.getParentId());
1207	1207	List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1208	1208	if (maternalDeliverModelList != null && maternalDeliverModelList.size() == 1) {
1209		- newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModelList.get(0).getDeliverDoctor())).getName());
1210		- newBabyManagerQueryModel.setParentId(maternalDeliverModelList.get(0).getParentId());
	1209	+ MaternalDeliverModel maternalDeliverModel = maternalDeliverModelList.get(0);
	1210	+ newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
	1211	+ newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
	1212	+ newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId());
	1213	+ newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid());
1211	1214	}
1212	1215	} catch (Exception e) {
1213	1216	// 什么都不干，这么干是为了避开原始数据的问题

...	...	@@ -7,13 +7,12 @@
7	7	*/
8	8	public class NewBabyManagerQueryModel {
9	9
10		- /**
11		- * @auther HuJiaqi
12		- * @createTime 2016年12月16日 10时35分
13		- * @discription
14		- */
15		- private String parentId;
	10	+ private String maternalDeliverId;
16	11
	12	+ private String patientId;
	13	+
	14	+ private String pId;
	15	+
17	16	/**
18	17	* @auther HuJiaqi
19	18	* @createTime 2016年12月08日 10时51分
...	...	@@ -119,6 +118,22 @@
119	118	*/
120	119	private String deliverDoctor;
121	120
	121	+ public String getMaternalDeliverId() {
	122	+ return maternalDeliverId;
	123	+ }
	124	+
	125	+ public void setMaternalDeliverId(String maternalDeliverId) {
	126	+ this.maternalDeliverId = maternalDeliverId;
	127	+ }
	128	+
	129	+ public String getpId() {
	130	+ return pId;
	131	+ }
	132	+
	133	+ public void setpId(String pId) {
	134	+ this.pId = pId;
	135	+ }
	136	+
122	137	public String getBirthYMD() {
123	138	return birthYMD;
124	139	}
125	140
...	...	@@ -239,12 +254,12 @@
239	254	this.deliverDoctor = deliverDoctor;
240	255	}
241	256
242		- public String getParentId() {
243		- return parentId;
	257	+ public String getPatientId() {
	258	+ return patientId;
244	259	}
245	260
246		- public void setParentId(String parentId) {
247		- this.parentId = parentId;
	261	+ public void setPatientId(String patientId) {
	262	+ this.patientId = patientId;
248	263	}
249	264	}