jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 31 additions and 1 deletions

...	...	@@ -369,6 +369,18 @@
369	369	//0 或者空未上传国家网 1上传国家网
370	370	private Integer sendCountry;
371	371
	372	+ //0 或者空孕检 1婚孕检
	373	+ private Integer hyj;
	374	+
	375	+
	376	+ public Integer getHyj() {
	377	+ return hyj;
	378	+ }
	379	+
	380	+ public void setHyj(Integer hyj) {
	381	+ this.hyj = hyj;
	382	+ }
	383	+
372	384	public Integer getSendCountry() {
373	385	return sendCountry;
374	386	}

...	...	@@ -62,6 +62,19 @@
62	62	//是否有B超
63	63	private Boolean hasBc;
64	64
	65	+ //0 或者空孕检 1婚孕检
	66	+ private Integer hyj;
	67	+
	68	+
	69	+ public Integer getHyj() {
	70	+ return hyj;
	71	+ }
	72	+
	73	+ public void setHyj(Integer hyj) {
	74	+ this.hyj = hyj;
	75	+ }
	76	+
	77	+
65	78	public Boolean getHasBc() {
66	79	return hasBc;
67	80	}

...	...	@@ -291,6 +291,11 @@
291	291	query.addCriteria(Criteria.where("wifeBCheck").exists(hasBc));
292	292	}
293	293
	294	+ Integer hyj = param.getHyj();
	295	+ if (hyj != null) {
	296	+ query.addCriteria(Criteria.where("hyj").is(hyj));
	297	+ }
	298	+
294	299	String createTime = param.getCreateTime();
295	300	if (StringUtils.isNotEmpty(createTime)) {
296	301	String[] arrs = createTime.split(" - ");