From 50bc818cb3f2297ac6b7e6458f5addb35bcb816d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 11 May 2017 16:24:27 +0800 Subject: [PATCH] update --- .../job/index/service/SyncDataService.java | 2 + .../operate/web/facade/AreaCountFacade.java | 48 +++++++++++----------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java index 43a4921..b4c4382 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java @@ -624,6 +624,8 @@ public class SyncDataService { patients.setAddressPostRest(DataUtil.getString(map.get("P_HUSBANDRRSTREET"))); // 详细地址 patients.setFileCode(DataUtil.getString(map.get("P_FILENUMBER"))); //建档编号 patients.setVcCardNo(DataUtil.getString(map.get("VC_CARDNO"))); //就诊卡号 + //是否隐藏 0 隐藏 1 显示 + patients.setEnable("1"); mongoTemplate.save(patients); System.out.println(patients.getId() + "============"); 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 1b13741..81ed71c 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 @@ -141,7 +141,7 @@ public class AreaCountFacade { " FROM ODS_D_HOSPITAL A " + " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" + " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " + - " WHERE 1=1 "; + " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; String issueSql = ""; if (StringUtils.isNotEmpty(time)) { @@ -206,7 +206,7 @@ public class AreaCountFacade { " FROM ODS_F_EXAMINE_HISTORY_ASC CC " + " LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " + - " WHERE CC.TICKETS_NO IS NOT NULL "; + " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; String examineSql = ""; if (StringUtils.isNotEmpty(time)) { @@ -327,7 +327,7 @@ public class AreaCountFacade { " FROM ODS_D_HOSPITAL A\n" + " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO " + " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " + - " WHERE 1=1 " ; + " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ; countSql+=issueSql; countSql+=" GROUP BY A.PROVINCE_ID,\n" + " A.PROVINCE,\n" + @@ -352,7 +352,7 @@ public class AreaCountFacade { " COUNT(CC.TICKETS_NO) AS SY_JS\n" + " FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" + " LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID" + - " WHERE CC.TICKETS_NO IS NOT NULL\n" ; + " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 " ; countSql+=examineSql; countSql+=" GROUP BY A.PROVINCE_ID,\n" + " A.PROVINCE,\n" + @@ -458,7 +458,7 @@ public class AreaCountFacade { " INNER JOIN (SELECT DISTINCT B.RECORD_ID,B.ISSUE_DATE" + " FROM ODS_D_HOSPITAL A " + " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" + - " WHERE 1=1 "; + " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT AA.ISSUE_DATE, " + " C.NAME, " + @@ -474,7 +474,7 @@ public class AreaCountFacade { " INNER JOIN (SELECT DISTINCT B.RECORD_ID,B.ISSUE_DATE" + " FROM ODS_D_HOSPITAL A " + " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" + - " WHERE 1=1 "; + " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -552,7 +552,7 @@ public class AreaCountFacade { " INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " + " INNER JOIN ODS_F_EXAMINE_TICKET D ON CC.TICKETS_NO=D.TICKETS_NO " + - " WHERE CC.TICKETS_NO IS NOT NULL "; + " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; String pageSql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ("; @@ -572,7 +572,7 @@ public class AreaCountFacade { " INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " + " INNER JOIN ODS_F_EXAMINE_TICKET D ON CC.TICKETS_NO=D.TICKETS_NO " + - " WHERE CC.TICKETS_NO IS NOT NULL "; + " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; if (ticketOrder != null) { sql+= " AND CC.TICKETS_ORDER= "+ticketOrder; @@ -818,7 +818,7 @@ public class AreaCountFacade { " INNER JOIN (SELECT DISTINCT B.RECORD_ID,B.ISSUE_DATE" + " FROM ODS_D_HOSPITAL A " + " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" + - " WHERE 1=1 "; + " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -917,7 +917,7 @@ public class AreaCountFacade { " INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " + " INNER JOIN ODS_F_EXAMINE_TICKET D ON CC.TICKETS_NO=D.TICKETS_NO " + - " WHERE CC.TICKETS_NO IS NOT NULL "; + " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; if (ticketOrder != null) { sql+= " AND CC.TICKETS_ORDER= "+ticketOrder; @@ -1093,7 +1093,7 @@ public class AreaCountFacade { " COUNT(B.RECORD_ID) AS JD_NUM\n" + " FROM ODS_D_HOSPITAL A\n" + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" + - " WHERE 1=1 "; + " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <>2 "; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -1159,7 +1159,7 @@ public class AreaCountFacade { if (pointType != null && pointType == 1){ countSql+=" AND B.NODE_ID=2 "; } - countSql+= "WHERE 1=1" ; + countSql+= "WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -1251,7 +1251,7 @@ public class AreaCountFacade { " COUNT(B.RECORD_ID) AS JD_NUM" + " FROM ODS_D_HOSPITAL A" + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO " + - " WHERE 1=1 " ; + " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 " ; if (StringUtils.isNotEmpty(time)) { @@ -1317,7 +1317,7 @@ public class AreaCountFacade { if (pointType != null && pointType == 1){ sql+=" AND B.NODE_ID=2 "; } - sql+=" WHERE 1= 1 " ; + sql+=" WHERE 1= 1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -1456,7 +1456,7 @@ public class AreaCountFacade { } String countSql = "SELECT COUNT(C.NAME) AS ALLCOUNT FROM ODS_F_GRAVIDA_RECORD C LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID " + - " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO WHERE 1 = 1"; + " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO WHERE 1 = 1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT C.CREATE_DATE,\n" + " C.NAME,\n" + @@ -1471,7 +1471,7 @@ public class AreaCountFacade { " FROM ODS_F_GRAVIDA_RECORD C\n" + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+ " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+ - " WHERE 1 = 1"; + " WHERE 1 = 1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -1544,7 +1544,7 @@ public class AreaCountFacade { String countSql = "SELECT COUNT(CC.NAME) ALLCOUNT FROM ODS_F_EXAMINE_HISTORY CC\n" + " INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID\n" + - " WHERE 1=1 "; + " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; // String pageSql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ("; // pageSql+=") A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start; String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT CC.EXAMINE_DATE,\n" + @@ -1560,7 +1560,7 @@ public class AreaCountFacade { " FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" + " INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID\n" + - " WHERE 1=1 "; + " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; if (pointType != null && pointType == 1){ sql+=" AND CC.NODE_ID=2 "; countSql+=" AND CC.NODE_ID=2 "; @@ -1645,7 +1645,7 @@ public class AreaCountFacade { " FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" + " INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID\n" + - " WHERE 1=1 "; + " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; if (pointType != null && pointType == 1){ sql+=" AND CC.NODE_ID=2 "; } @@ -1738,7 +1738,7 @@ public class AreaCountFacade { " FROM ODS_F_GRAVIDA_RECORD C " + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID" + " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+ - " WHERE 1=1 "; + " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; if (StringUtils.isNotEmpty(time)) @@ -1822,7 +1822,7 @@ public class AreaCountFacade { " SELECT DISTINCT A.YCY_STSTEM_ID " + " FROM ODS_F_EXAMINE_HISTORY_ASC CC " + " INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" + - " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID WHERE CC.TICKETS_NO IS NOT NULL "; + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; if (StringUtils.isNotEmpty(time)) { @@ -1863,7 +1863,7 @@ public class AreaCountFacade { " FROM ODS_D_HOSPITAL A\n" + " INNER JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" + " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID\n" + - " WHERE 1 = 1 "; + " WHERE 1 = 1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -1912,7 +1912,7 @@ public class AreaCountFacade { if (pointType != null && pointType == 1){ sql+=" AND B.NODE_ID=2 "; } - sql+=" INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID WHERE 1=1" ; + sql+=" INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -1949,7 +1949,7 @@ public class AreaCountFacade { sql+=" UNION SELECT DISTINCT A.YCY_STSTEM_ID " + " FROM ODS_D_HOSPITAL A " + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO " + - " WHERE 1= 1 "; + " WHERE 1= 1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; -- 1.8.3.1