jiangjiazhi / regional-platform

Authored by shiyang almost 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 29 additions and 1 deletions

...	...	@@ -1251,6 +1251,17 @@
1251	1251	this.riskCodeExist = riskCodeExist;
1252	1252	}
1253	1253
	1254	+ //隆化县， 1：高危体弱合并
	1255	+ private Integer highRiskAndWeakSon;
	1256	+
	1257	+ public Integer getHighRiskAndWeakSon() {
	1258	+ return highRiskAndWeakSon;
	1259	+ }
	1260	+
	1261	+ public void setHighRiskAndWeakSon(Integer highRiskAndWeakSon) {
	1262	+ this.highRiskAndWeakSon = highRiskAndWeakSon;
	1263	+ }
	1264	+
1254	1265	@Override
1255	1266	public MongoQuery convertToQuery() {
1256	1267	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -1890,6 +1901,17 @@
1890	1901	if (null != endCaseTimeStart && endCaseTimeEnd != null) {
1891	1902	Criteria cr = Criteria.where("endCaseTime").gte(endCaseTimeStart).lte(endCaseTimeEnd);
1892	1903	condition.andCondition(new MongoCondition(cr));
	1904	+ }
	1905	+
	1906	+ if(null != highRiskAndWeakSon){ //隆化县， 1：高危体弱合并
	1907	+ MongoCondition c1 = MongoCondition.newInstance();
	1908	+ MongoCondition con1 = MongoCondition.newInstance("highRisk", 1, MongoOper.IS);
	1909	+ MongoCondition con2 = MongoCondition.newInstance("weakSon", 1, MongoOper.IS);
	1910	+ if (c != null) {
	1911	+ c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
	1912	+ } else {
	1913	+ c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	1914	+ }
1893	1915	}
1894	1916
1895	1917	if (null != phoneOrcardNo) {

...	...	@@ -3281,7 +3281,13 @@
3281	3281	if (request.getHighRiskType() != null) {
3282	3282	if (request.getHighRiskType() == 1) {//高危
3283	3283	// babyQuery.setLastHighRisk(1);
3284		- babyQuery.setHighRisk(1);
	3284	+ for (String s : babyQuery.getHospitalIdList()) {//隆化县儿童管理 1:高危页面高危与体弱合并显示
	3285	+ if(Integer.valueOf(s)==2100001605){
	3286	+ babyQuery.setHighRiskAndWeakSon(1);
	3287	+ }else{
	3288	+ babyQuery.setHighRisk(1);
	3289	+ }
	3290	+ }
3285	3291	} else if (request.getHighRiskType() == 3) {//体弱
3286	3292	babyQuery.setWeakSon(1);
3287	3293	} else if (request.getHighRiskType() == 0) {