jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 27 additions and 1 deletions

...	...	@@ -67,6 +67,16 @@
67	67
68	68	//是否抽血 1不抽血
69	69	private Integer checkBlood;
	70	+ //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0）
	71	+ private Integer isUploadingProvince;
	72	+
	73	+ public Integer getIsUploadingProvince() {
	74	+ return isUploadingProvince;
	75	+ }
	76	+
	77	+ public void setIsUploadingProvince(Integer isUploadingProvince) {
	78	+ this.isUploadingProvince = isUploadingProvince;
	79	+ }
70	80
71	81	public Integer getCheckBlood() {
72	82	return checkBlood;

...	...	@@ -88,6 +88,19 @@
88	88	private String doctorStr;
89	89
90	90
	91	+ //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0）
	92	+ private Integer isUploadingProvince;
	93	+
	94	+ @Override
	95	+ public Integer getIsUploadingProvince() {
	96	+ return isUploadingProvince;
	97	+ }
	98	+
	99	+ @Override
	100	+ public void setIsUploadingProvince(Integer isUploadingProvince) {
	101	+ this.isUploadingProvince = isUploadingProvince;
	102	+ }
	103	+
91	104	public String getHusbandAccountAddressStr() {
92	105	return husbandAccountAddressStr;
93	106	}

...	...	@@ -367,6 +367,10 @@
367	367	end = DateUtil.getDayLastSecond(end);
368	368	query.addCriteria(Criteria.where("fillDate").gte(start).lte(end));
369	369	}
	370	+ Integer isUploadingProvince = param.getIsUploadingProvince();
	371	+ if (isUploadingProvince != null) {
	372	+ query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince));
	373	+ }
370	374
371	375	query = getQueryByAddress(param, searchType, query);
372	376
...	...	@@ -532,7 +536,6 @@
532	536	setDoctorName(result.getHusbandClinicalCheck());
533	537	setDoctorName(result.getHusbandOtherCheck());
534	538	setDoctorName(result.getResultAdvice());
535		-
536	539	return result;
537	540	}
538	541