jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 42 additions and 0 deletions

...	...	@@ -403,6 +403,17 @@
403	403	//分娩医生
404	404	private String deliverDoctor;
405	405
	406	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	407	+ public Integer productionSieveType;
	408	+
	409	+ public Integer getProductionSieveType() {
	410	+ return productionSieveType;
	411	+ }
	412	+
	413	+ public void setProductionSieveType(Integer productionSieveType) {
	414	+ this.productionSieveType = productionSieveType;
	415	+ }
	416	+
406	417	public String getDeliverDoctor() {
407	418	return deliverDoctor;
408	419	}
...	...	@@ -826,6 +837,9 @@
826	837	}
827	838	if (null != firstCheckId) {
828	839	condition = condition.and("firstCheckId", firstCheckId, MongoOper.IS);
	840	+ }
	841	+ if (null != productionSieveType) {
	842	+ condition = condition.and("productionSieveType", productionSieveType, MongoOper.IS);
829	843	}
830	844
831	845	//孕产建档管理初诊医生是否

...	...	@@ -679,6 +679,10 @@
679	679	if (riskPatientsQueryRequest.getBuildWeekEnd() != null) {
680	680	patientsQuery.setBuildDaysEnd((riskPatientsQueryRequest.getBuildWeekEnd() + 1) * 7 - 1);
681	681	}
	682	+ //秦皇岛需求是否产筛筛选productionSieveType 0：未产筛 1：已产筛
	683	+ if (riskPatientsQueryRequest.getProductionSieveType() != null) {
	684	+ patientsQuery.setProductionSieveType(riskPatientsQueryRequest.getProductionSieveType());
	685	+ }
682	686
683	687
684	688	return patientsQuery;

...	...	@@ -192,6 +192,17 @@
192	192	//体重异常管理-接收建档时间筛选用
193	193	private String buildDate;
194	194
	195	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	196	+ public Integer productionSieveType;
	197	+
	198	+ public Integer getProductionSieveType() {
	199	+ return productionSieveType;
	200	+ }
	201	+
	202	+ public void setProductionSieveType(Integer productionSieveType) {
	203	+ this.productionSieveType = productionSieveType;
	204	+ }
	205	+
195	206	public String getBuildDate() {
196	207	return buildDate;
197	208	}

...	...	@@ -104,6 +104,17 @@
104	104
105	105	private String remark;
106	106
	107	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	108	+ public Integer productionSieveType;
	109	+
	110	+ public Integer getProductionSieveType() {
	111	+ return productionSieveType;
	112	+ }
	113	+
	114	+ public void setProductionSieveType(Integer productionSieveType) {
	115	+ this.productionSieveType = productionSieveType;
	116	+ }
	117	+
107	118	public String getRemark() {
108	119	return remark;
109	120	}
...	...	@@ -494,6 +505,8 @@
494	505	if(StringUtils.isNotEmpty(destModel.getBreastType())){
495	506	setBreastType(destModel.getBreastType());
496	507	}
	508	+ //秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
	509	+ setProductionSieveType(destModel.getProductionSieveType());
497	510	return this;
498	511	}
499	512	}