jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 9 additions and 9 deletions

...	...	@@ -22,7 +22,7 @@
22	22	private String id;
23	23	private Integer yn;
24	24	//儿童建档ID
25		- private String parentId;
	25	+ private String pid;
26	26	private String hospitalId;
27	27
28	28	// 检查日期
29	29
...	...	@@ -58,12 +58,12 @@
58	58	this.yn = yn;
59	59	}
60	60
61		- public String getParentId() {
62		- return parentId;
	61	+ public String getPid() {
	62	+ return pid;
63	63	}
64	64
65		- public void setParentId(String parentId) {
66		- this.parentId = parentId;
	65	+ public void setPid(String pid) {
	66	+ this.pid = pid;
67	67	}
68	68
69	69	public String getHospitalId() {
70	70
...	...	@@ -150,9 +150,9 @@
150	150	if (null != yn) {
151	151	condition = condition.and("yn", yn, MongoOper.IS);
152	152	}
153		- if (StringUtils.isNotEmpty(parentId)) {
	153	+ if (StringUtils.isNotEmpty(pid)) {
154	154
155		- condition = condition.and("parentId", parentId, MongoOper.IS);
	155	+ condition = condition.and("pid", pid, MongoOper.IS);
156	156	}
157	157	if (StringUtils.isNotEmpty(hospitalId)) {
158	158

...	...	@@ -256,7 +256,7 @@
256	256	//单人多条专病记录
257	257	List <BreastModel> breastModelList = new ArrayList <>();
258	258
259		- if (StringUtils.isNotEmpty(babyQuery.getParentId())) {
	259	+ if (StringUtils.isNotEmpty(babyQuery.getPid())) {
260	260	babyQuery.setYn(YnEnums.YES.getId());
261	261	babyQuery.setHospitalId(hospitalId);
262	262	babyQuery.setSort("checkDate");
...	...	@@ -296,7 +296,7 @@
296	296	List <BreastResult> breastResultList = new ArrayList <>();
297	297	//单人多条专病记录
298	298	List <BreastModel> breastModelList = new ArrayList <>();
299		- if (StringUtils.isEmpty(babyQuery.getParentId())) {
	299	+ if (StringUtils.isEmpty(babyQuery.getPid())) {
300	300	babyQuery.setNeed("true");
301	301	babyQuery.setYn(YnEnums.YES.getId());
302	302	babyQuery.setHospitalId(hospitalId);