jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 26 additions and 1 deletions

...	...	@@ -58,6 +58,17 @@
58	58
59	59	private String phoneOrcardNo;
60	60
	61	+ //畸形key
	62	+ private String deformityKey;
	63	+
	64	+ public String getDeformityKey() {
	65	+ return deformityKey;
	66	+ }
	67	+
	68	+ public void setDeformityKey(String deformityKey) {
	69	+ this.deformityKey = deformityKey;
	70	+ }
	71	+
61	72	public String getMphoneOrFphone() {
62	73	return mphoneOrFphone;
63	74	}
...	...	@@ -608,7 +619,10 @@
608	619	condition = condition.and("heightWeight", heightWeight, MongoOper.IS);
609	620	}
610	621
611		-
	622	+ //畸形
	623	+ if (StringUtils.isNotEmpty(deformityKey)) {
	624	+ condition = condition.and(deformityKey, true, MongoOper.IS);
	625	+ }
612	626	if (!StringUtils.isEmpty(mcertNo)) {
613	627	condition = condition.and("mcertNo", mcertNo, MongoOper.IS);
614	628	}

...	...	@@ -2090,6 +2090,7 @@
2090	2090	// 什么都不做，这里是数据传入错误了
2091	2091	}
2092	2092	}
	2093	+ babyModelQuery.setDeformityKey(newBabyManagerRequest.getDeformityKey());
2093	2094	babyModelQuery.setDueType(StringUtils.isEmpty(newBabyManagerRequest.getDueType()) ? null : newBabyManagerRequest.getDueType());
2094	2095	babyModelQuery.setParentId(StringUtils.isEmpty(newBabyManagerRequest.getPatientId()) ? null : newBabyManagerRequest.getPatientId());
2095	2096	if (!newBabyManagerRequest.isExcel()) {

...	...	@@ -33,6 +33,16 @@
33	33	private Integer operatorId;
34	34
35	35	private String patientId;
	36	+ //畸形key
	37	+ private String deformityKey;
	38	+
	39	+ public String getDeformityKey() {
	40	+ return deformityKey;
	41	+ }
	42	+
	43	+ public void setDeformityKey(String deformityKey) {
	44	+ this.deformityKey = deformityKey;
	45	+ }
36	46
37	47	public String getPatientId() {
38	48	return patientId;