jiangjiazhi / regional-platform | GitLab

Commit 52187a6c8b2ce828d2c31e91237aa1b47571bc2f

Authored by wtt over 4 years ago

1 parent 90b58a78c5

Exists in master and in 6 other branches

update

Showing 3 changed files with 3 additions and 2 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

...	...	@@ -398,7 +398,7 @@
398	398	}
399	399	if (null != cCDateEnd) {
400	400	if (null != c) {
401		- c = c.lte(cCDateEnd);
	401	+ c = c.lte(cCDateEnd).and("caseClosed").is("1");
402	402	} else {
403	403	c = Criteria.where("cCDate").lte(cCDateEnd);
404	404	}

...	...	@@ -340,7 +340,7 @@
340	340	}
341	341	if (null != cCDateEnd) {
342	342	if (null != c) {
343		- c = c.lte(cCDateEnd);
	343	+ c = c.lte(cCDateEnd).and("caseClosed").is("1");
344	344	} else {
345	345	c = Criteria.where("cCDate").lte(cCDateEnd);
346	346	}

...	...	@@ -175,6 +175,7 @@
175	175	for (int i = 0; i <departmentReferralModels.size() ; i++) {
176	176	DepartmentReferralModel departmentReferralModel = departmentReferralModels.get(i);
177	177	departmentReferralModel.setStatus(2); //接受状态
	178	+ departmentReferralModel.setAcceptDate(new Date());
178	179	babyDepartmentReferralService.update(departmentReferralModel, departmentReferralModel.getId());
179	180	}
180	181	}