jiangjiazhi / regional-platform | GitLab

Commit 530d00d06a2f43551cabed946b35de10adb9965e

Authored by liquanyu about 8 years ago

1 parent b669d4d9b6

Exists in master and in 6 other branches

update

Showing 2 changed files with 4 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java

...	...	@@ -111,7 +111,8 @@
111	111	});
112	112
113	113	for (CheckResponse check:list) {
114		- String ymd = DateUtil.getyyyy_MM_dd(check.getModified());
	114	+ Date date = check.getModified() == null ? check.getApplyDate() : check.getModified();
	115	+ String ymd = DateUtil.getyyyy_MM_dd(date);
115	116	if (!keyList.contains(ymd)) {
116	117	keyList.add(ymd);
117	118	}

...	...	@@ -513,7 +513,8 @@
513	513	return newList;
514	514	}
515	515
516		- private String getAreaCountFacadeSql(String startDate, String endDate, Integer startWeek, Integer endWeek, Integer childBirth, String hospitalId, List<Object> params) {
	516	+ private String
	517	+ getAreaCountFacadeSql(String startDate, String endDate, Integer startWeek, Integer endWeek, Integer childBirth, String hospitalId, List<Object> params) {
517	518	StringBuilder sql = new StringBuilder();
518	519	sql.append("SELECT B.EXAMINE_HISTORY_NUM, ")
519	520	.append("COUNT(B.EXAMINE_ID) AS EXAMINE_CNT ")