From 147e2620051546b09df720ccb2d89223b013363c Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 19 Jan 2017 15:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/BabyStatisticsManagerFacade.java    | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
index 196bb6f..aa3b2de 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
@@ -526,22 +526,22 @@ public class BabyStatisticsManagerFacade {
                         "A.CHILD_CATEGORY_ID," +
                         "A.CHILD_CATEGORY," +
                         "(CASE WHEN A.BIRTH_HOSPITAL_NO=A.HOSPITAL_NO THEN '本院分娩'" +
-                        "WHEN A.BIRTH_HOSPITAL_NO<>A.HOSPITAL_NO AND A.BIRTH_HOSPITAL_NO IS NOT NULL THEN '外院分娩'" +
-                        "WHEN A.BIRTH_HOSPITAL_NO IS NULL THEN '未知'" +
+                        " WHEN A.BIRTH_HOSPITAL_NO<>A.HOSPITAL_NO AND A.BIRTH_HOSPITAL_NO IS NOT NULL THEN '外院分娩'" +
+                        " WHEN A.BIRTH_HOSPITAL_NO IS NULL THEN '未知'" +
                         "END) AS LB_NAME," +
                         "COUNT(*) AS CNT" +
-                        "FROM ODS_F_INFANT_RECORD A" +
-                        "INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
+                        " FROM ODS_F_INFANT_RECORD A" +
+                        " INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
                         // 医院，判断本院外院使用
-                        "WHERE B.YCY_STSTEM_ID=" + hospitalId;
+                        " WHERE B.YCY_STSTEM_ID=" + hospitalId;
         // 这三个查询条件暂时没用，直接注释掉
         // "AND B.PROVINCE_ID=" +
         // "AND B.CITY_ID=" +
         // "AND B.AREA_COUNTY_ID="
         if (StringUtils.isNotEmpty(babyStatisticsManagerBuildSourceListRequest.getBuildDate())) {
-            sql += "AND A.INSERT_DATE BETWEEN" + buildDateStart + "AND" + buildDateEnd;
+            sql += " AND A.INSERT_DATE BETWEEN" + buildDateStart + "AND" + buildDateEnd;
         }
-        sql += "GROUP BY" +
+        sql += " GROUP BY" +
                 "B.PROVINCE_ID," +
                 "B.PROVINCE," +
                 "B.CITY_ID," +
@@ -664,11 +664,11 @@ public class BabyStatisticsManagerFacade {
                         "B.HOSPITAL_NAME," +
                         "TRUNC(MONTHS_BETWEEN(C.EXAMINE_DATE,A.BIRTHDAY)) AS EXAMINE_MONTH," +
                         "COUNT(*) AS CNT" +
-                        "FROM ODS_F_INFANT_RECORD A" +
-                        "INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
-                        "LEFT JOIN ODS_F_CHILD_PHYSICAL C ON A.RECORD_ID=C.RECORD_ID AND C.EXAMINE_HISTORY_NUM=1" +
-                        "WHERE A.HOSPITAL_NO=A.BIRTH_HOSPITAL_NO" +
-                        "AND B.YCY_STSTEM_ID='" + hospitalId+"'";
+                        " FROM ODS_F_INFANT_RECORD A" +
+                        " INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
+                        " LEFT JOIN ODS_F_CHILD_PHYSICAL C ON A.RECORD_ID=C.RECORD_ID AND C.EXAMINE_HISTORY_NUM=1" +
+                        " WHERE A.HOSPITAL_NO=A.BIRTH_HOSPITAL_NO" +
+                        " AND B.YCY_STSTEM_ID='" + hospitalId+"'";
         // 这三个查询条件暂时没用，直接注释掉
         // "AND B.PROVINCE_ID="+
         // "AND B.CITY_ID="+
@@ -676,7 +676,7 @@ public class BabyStatisticsManagerFacade {
         if (StringUtils.isNotEmpty(babyStatisticsManagerSelfConversionListRequest.getBirthDate())) {
             sql += " AND A.INSERT_DATE BETWEEN TO_DATE('" + birthDateStart + "','YYYY-MM-DD') AND TO_DATE('" + birthDateEnd+"','YYYY-MM-DD')";
         }
-        sql += "GROUP BY" +
+        sql += " GROUP BY " +
                 "B.PROVINCE_ID," +
                 "B.PROVINCE," +
                 "B.CITY_ID," +
-- 
1.8.3.1