jiangjiazhi / regional-platform | GitLab

Commit 9a3b60efe22433cec7c1858bdc0f1c82e25f63be

Authored by wtt about 5 years ago

1 parent e99aa94e11

Exists in master and in 6 other branches

update

Showing 3 changed files with 9 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyDepartmentReferralFacade.java

...	...	@@ -300,7 +300,7 @@
300	300	//结案转归 1痊愈□ 2好转□ 3转院□ 4失访□
301	301	if (StringUtils.isNotEmpty(cCOutcome)) {
302	302
303		- condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS);
	303	+ condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS).and("caseClosed", "1", MongoOper.IS);
304	304	}
305	305
306	306	if (StringUtils.isNotEmpty(caseClosed)) {

...	...	@@ -254,8 +254,7 @@
254	254	}
255	255	//结案转归 1痊愈□ 2好转□ 3转院□ 4失访□
256	256	if (StringUtils.isNotEmpty(cCOutcome)) {
257		-
258		- condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS);
	257	+ condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS).and("caseClosed", "1", MongoOper.IS);
259	258	}
260	259
261	260	Criteria c = null;

...	...	@@ -373,8 +373,13 @@
373	373	babyQuery.setSort("createDate");
374	374	List <DepartmentReferralModel> departmentReferralModels = babyDepartmentReferralService.queryOne(babyQuery);
375	375	if (CollectionUtils.isNotEmpty(departmentReferralModels)) {
376		- model.setStatus(2); //接受状态
377		- model.setAcceptDate(new Date());
	376	+ for (int i = 0; i < departmentReferralModels.size(); i++) {
	377	+ DepartmentReferralModel departmentReferralModel = departmentReferralModels.get(i);
	378	+ if(departmentReferralModel.getStatus()!=null && departmentReferralModel.getStatus()==1){
	379	+ model.setStatus(2); //接受状态
	380	+ model.setAcceptDate(new Date());
	381	+ }
	382	+ }
378	383	}
379	384	}
380	385	//erbao 儿保检查