From 7aaac12691885019da9c484048f6299bfe52b0d0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 1 Apr 2017 16:37:08 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/AreaCountFacade.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 16350e6..f96d930 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -335,8 +335,7 @@ public class AreaCountFacade { " A.HOSPITAL_NO,\n" + " A.HOSPITAL_NAME,\n" + " A.YCY_STSTEM_ID\n" + - " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO\n" + - " GROUP BY ROLLUP("+groupBySql1+")" ; + " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO\n" ; if (StringUtils.isNotEmpty(hospitalId)) { countSql+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'"; @@ -350,7 +349,7 @@ public class AreaCountFacade { } } - countSql+=" ORDER BY 1,2,3"; + countSql+=" GROUP BY ROLLUP("+groupBySql1+") ORDER BY 1,2,3"; System.out.println("basesql===="+sql1); System.out.println("countSql====" + countSql); @@ -1172,8 +1171,7 @@ public class AreaCountFacade { " A.HOSPITAL_NO,\n" + " A.HOSPITAL_NAME,\n" + " A.YCY_STSTEM_ID\n" + - " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO\n" + - " GROUP BY ROLLUP("+groupBySql1+" ) " ; + " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO\n" ; if (StringUtils.isNotEmpty(hospitalId)) { countSql+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'"; @@ -1187,7 +1185,7 @@ public class AreaCountFacade { } } - countSql+=" ORDER BY 1,2,3"; + countSql+=" GROUP BY ROLLUP("+groupBySql1+" ) ORDER BY 1,2,3"; -- 1.8.3.1