jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

1 parent 1906dce696

Exists in master and in 6 other branches

Showing 2 changed files with 27 additions and 0 deletions

...	...	@@ -3444,6 +3444,8 @@
3444	3444	if(StringUtils.isNotEmpty(hospitalId)){
3445	3445	recommendQuery.setYyzyfmHospitalId(hospitalId);
3446	3446	}
	3447	+ //是否隐藏更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
	3448	+ recommendQuery.setExtEnable(false);
3447	3449	MongoQuery query = recommendQuery.convertToQuery().addOrder(Sort.Direction.DESC, "bookbuildingDate");
3448	3450	AggregationOperation queryParam = Aggregation.match(query.getCriteria());
3449	3451	AggregationOperation group = Aggregation.group("townOrgId","recommend");
3450	3452
...	...	@@ -3478,7 +3480,10 @@
3478	3480	if(StringUtils.isNotEmpty(hospitalId)){
3479	3481	recommendQuery.setYyzyfmHospitalId(hospitalId);
3480	3482	}
	3483	+ //是否隐藏更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
	3484	+ recommendQuery.setExtEnable(false);
3481	3485	MongoQuery query = recommendQuery.convertToQuery();
	3486	+ query.convertToMongoQuery().toString();
3482	3487	//分页后总数量
3483	3488	recommendQuery.mysqlBuild((int)mongoTemplate.count(query.convertToMongoQuery(),Patients.class));
3484	3489	//分页

...	...	@@ -9,7 +9,9 @@
9	9	import com.lyms.platform.common.utils.StringUtils;
10	10	import org.springframework.data.mongodb.core.query.Criteria;
11	11
	12	+import java.util.ArrayList;
12	13	import java.util.Date;
	14	+import java.util.List;
13	15
14	16	/**
15	17	*
16	18
...	...	@@ -43,7 +45,17 @@
43	45	*/
44	46	private String yyzyfmHospitalId;
45	47
	48	+ //是否隐藏更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
	49	+ private Boolean extEnable;
46	50
	51	+ public Boolean getExtEnable() {
	52	+ return extEnable;
	53	+ }
	54	+
	55	+ public void setExtEnable(Boolean extEnable) {
	56	+ this.extEnable = extEnable;
	57	+ }
	58	+
47	59	public String getYyzyfmHospitalId() {
48	60	return yyzyfmHospitalId;
49	61	}
...	...	@@ -95,6 +107,16 @@
95	107	}
96	108	if (StringUtils.isNotEmpty(yyzyfmHospitalId)) {
97	109	condition = condition.and("yyzyfmHospitalId", yyzyfmHospitalId, MongoOper.IS);
	110	+ }
	111	+ //enable ：
	112	+ // 0，转诊建档，待接收
	113	+ // 1，转诊建档，已接收
	114	+ // 2，隐藏建档，在A院建档去B医院做产检-----建档管理里面不展示
	115	+ if (null != extEnable) {
	116	+ List list = new ArrayList();
	117	+ list.add("1");
	118	+ list.add("2");
	119	+ condition = condition.and("enable", list, MongoOper.NIN);
98	120	}
99	121	Criteria c = null;
100	122