jiangjiazhi / regional-platform

Commit 50bc818cb3f2297ac6b7e6458f5addb35bcb816d

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 26 additions and 24 deletions

platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java

...	...	@@ -624,6 +624,8 @@
624	624	patients.setAddressPostRest(DataUtil.getString(map.get("P_HUSBANDRRSTREET"))); // 详细地址
625	625	patients.setFileCode(DataUtil.getString(map.get("P_FILENUMBER"))); //建档编号
626	626	patients.setVcCardNo(DataUtil.getString(map.get("VC_CARDNO"))); //就诊卡号
	627	+ //是否隐藏 0 隐藏 1 显示
	628	+ patients.setEnable("1");
627	629
628	630	mongoTemplate.save(patients);
629	631	System.out.println(patients.getId() + "============");

...	...	@@ -141,7 +141,7 @@
141	141	" FROM ODS_D_HOSPITAL A " +
142	142	" LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
143	143	" INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " +
144		- " WHERE 1=1 ";
	144	+ " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 ";
145	145	String issueSql = "";
146	146	if (StringUtils.isNotEmpty(time))
147	147	{
...	...	@@ -206,7 +206,7 @@
206	206	" FROM ODS_F_EXAMINE_HISTORY_ASC CC " +
207	207	" LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " +
208	208	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " +
209		- " WHERE CC.TICKETS_NO IS NOT NULL ";
	209	+ " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 ";
210	210	String examineSql = "";
211	211	if (StringUtils.isNotEmpty(time))
212	212	{
...	...	@@ -327,7 +327,7 @@
327	327	" FROM ODS_D_HOSPITAL A\n" +
328	328	" LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO " +
329	329	" INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " +
330		- " WHERE 1=1 " ;
	330	+ " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ;
331	331	countSql+=issueSql;
332	332	countSql+=" GROUP BY A.PROVINCE_ID,\n" +
333	333	" A.PROVINCE,\n" +
...	...	@@ -352,7 +352,7 @@
352	352	" COUNT(CC.TICKETS_NO) AS SY_JS\n" +
353	353	" FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" +
354	354	" 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" +
355		- " WHERE CC.TICKETS_NO IS NOT NULL\n" ;
	355	+ " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 " ;
356	356	countSql+=examineSql;
357	357	countSql+=" GROUP BY A.PROVINCE_ID,\n" +
358	358	" A.PROVINCE,\n" +
...	...	@@ -458,7 +458,7 @@
458	458	" INNER JOIN (SELECT DISTINCT B.RECORD_ID,B.ISSUE_DATE" +
459	459	" FROM ODS_D_HOSPITAL A " +
460	460	" LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
461		- " WHERE 1=1 ";
	461	+ " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 ";
462	462
463	463	String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT AA.ISSUE_DATE, " +
464	464	" C.NAME, " +
...	...	@@ -474,7 +474,7 @@
474	474	" INNER JOIN (SELECT DISTINCT B.RECORD_ID,B.ISSUE_DATE" +
475	475	" FROM ODS_D_HOSPITAL A " +
476	476	" LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
477		- " WHERE 1=1 ";
	477	+ " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 ";
478	478	if (StringUtils.isNotEmpty(time))
479	479	{
480	480	String startTime = time.split(" - ")[0];
...	...	@@ -552,7 +552,7 @@
552	552	" INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " +
553	553	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " +
554	554	" INNER JOIN ODS_F_EXAMINE_TICKET D ON CC.TICKETS_NO=D.TICKETS_NO " +
555		- " WHERE CC.TICKETS_NO IS NOT NULL ";
	555	+ " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 ";
556	556
557	557	String pageSql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM (";
558	558
...	...	@@ -572,7 +572,7 @@
572	572	" INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " +
573	573	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " +
574	574	" INNER JOIN ODS_F_EXAMINE_TICKET D ON CC.TICKETS_NO=D.TICKETS_NO " +
575		- " WHERE CC.TICKETS_NO IS NOT NULL ";
	575	+ " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 ";
576	576	if (ticketOrder != null)
577	577	{
578	578	sql+= " AND CC.TICKETS_ORDER= "+ticketOrder;
...	...	@@ -818,7 +818,7 @@
818	818	" INNER JOIN (SELECT DISTINCT B.RECORD_ID,B.ISSUE_DATE" +
819	819	" FROM ODS_D_HOSPITAL A " +
820	820	" LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
821		- " WHERE 1=1 ";
	821	+ " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 ";
822	822	if (StringUtils.isNotEmpty(time))
823	823	{
824	824	String startTime = time.split(" - ")[0];
...	...	@@ -917,7 +917,7 @@
917	917	" INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " +
918	918	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " +
919	919	" INNER JOIN ODS_F_EXAMINE_TICKET D ON CC.TICKETS_NO=D.TICKETS_NO " +
920		- " WHERE CC.TICKETS_NO IS NOT NULL ";
	920	+ " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 ";
921	921	if (ticketOrder != null)
922	922	{
923	923	sql+= " AND CC.TICKETS_ORDER= "+ticketOrder;
...	...	@@ -1093,7 +1093,7 @@
1093	1093	" COUNT(B.RECORD_ID) AS JD_NUM\n" +
1094	1094	" FROM ODS_D_HOSPITAL A\n" +
1095	1095	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" +
1096		- " WHERE 1=1 ";
	1096	+ " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <>2 ";
1097	1097	if (StringUtils.isNotEmpty(time))
1098	1098	{
1099	1099	String startTime = time.split(" - ")[0];
...	...	@@ -1159,7 +1159,7 @@
1159	1159	if (pointType != null && pointType == 1){
1160	1160	countSql+=" AND B.NODE_ID=2 ";
1161	1161	}
1162		- countSql+= "WHERE 1=1" ;
	1162	+ countSql+= "WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ;
1163	1163	if (StringUtils.isNotEmpty(time))
1164	1164	{
1165	1165	String startTime = time.split(" - ")[0];
...	...	@@ -1251,7 +1251,7 @@
1251	1251	" COUNT(B.RECORD_ID) AS JD_NUM" +
1252	1252	" FROM ODS_D_HOSPITAL A" +
1253	1253	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO " +
1254		- " WHERE 1=1 " ;
	1254	+ " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 " ;
1255	1255
1256	1256	if (StringUtils.isNotEmpty(time))
1257	1257	{
...	...	@@ -1317,7 +1317,7 @@
1317	1317	if (pointType != null && pointType == 1){
1318	1318	sql+=" AND B.NODE_ID=2 ";
1319	1319	}
1320		- sql+=" WHERE 1= 1 " ;
	1320	+ sql+=" WHERE 1= 1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ;
1321	1321	if (StringUtils.isNotEmpty(time))
1322	1322	{
1323	1323	String startTime = time.split(" - ")[0];
...	...	@@ -1456,7 +1456,7 @@
1456	1456	}
1457	1457
1458	1458	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 " +
1459		- " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO WHERE 1 = 1";
	1459	+ " 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 ";
1460	1460
1461	1461	String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT C.CREATE_DATE,\n" +
1462	1462	" C.NAME,\n" +
...	...	@@ -1471,7 +1471,7 @@
1471	1471	" FROM ODS_F_GRAVIDA_RECORD C\n" +
1472	1472	" LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+
1473	1473	" INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+
1474		- " WHERE 1 = 1";
	1474	+ " WHERE 1 = 1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 ";
1475	1475	if (StringUtils.isNotEmpty(time))
1476	1476	{
1477	1477	String startTime = time.split(" - ")[0];
...	...	@@ -1544,7 +1544,7 @@
1544	1544	String countSql = "SELECT COUNT(CC.NAME) ALLCOUNT FROM ODS_F_EXAMINE_HISTORY CC\n" +
1545	1545	" INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" +
1546	1546	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID\n" +
1547		- " WHERE 1=1 ";
	1547	+ " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 ";
1548	1548	// String pageSql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM (";
1549	1549	// pageSql+=") A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
1550	1550	String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT CC.EXAMINE_DATE,\n" +
...	...	@@ -1560,7 +1560,7 @@
1560	1560	" FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" +
1561	1561	" INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" +
1562	1562	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID\n" +
1563		- " WHERE 1=1 ";
	1563	+ " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 ";
1564	1564	if (pointType != null && pointType == 1){
1565	1565	sql+=" AND CC.NODE_ID=2 ";
1566	1566	countSql+=" AND CC.NODE_ID=2 ";
...	...	@@ -1645,7 +1645,7 @@
1645	1645	" FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" +
1646	1646	" INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" +
1647	1647	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID\n" +
1648		- " WHERE 1=1 ";
	1648	+ " WHERE 1=1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 ";
1649	1649	if (pointType != null && pointType == 1){
1650	1650	sql+=" AND CC.NODE_ID=2 ";
1651	1651	}
...	...	@@ -1738,7 +1738,7 @@
1738	1738	" FROM ODS_F_GRAVIDA_RECORD C " +
1739	1739	" LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID" +
1740	1740	" INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+
1741		- " WHERE 1=1 ";
	1741	+ " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 ";
1742	1742
1743	1743
1744	1744	if (StringUtils.isNotEmpty(time))
...	...	@@ -1822,7 +1822,7 @@
1822	1822	" SELECT DISTINCT A.YCY_STSTEM_ID " +
1823	1823	" FROM ODS_F_EXAMINE_HISTORY_ASC CC " +
1824	1824	" INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" +
1825		- " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID WHERE CC.TICKETS_NO IS NOT NULL ";
	1825	+ " 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 ";
1826	1826
1827	1827	if (StringUtils.isNotEmpty(time))
1828	1828	{
...	...	@@ -1863,7 +1863,7 @@
1863	1863	" FROM ODS_D_HOSPITAL A\n" +
1864	1864	" INNER JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" +
1865	1865	" INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID\n" +
1866		- " WHERE 1 = 1 ";
	1866	+ " WHERE 1 = 1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 ";
1867	1867	if (StringUtils.isNotEmpty(time))
1868	1868	{
1869	1869	String startTime = time.split(" - ")[0];
...	...	@@ -1912,7 +1912,7 @@
1912	1912	if (pointType != null && pointType == 1){
1913	1913	sql+=" AND B.NODE_ID=2 ";
1914	1914	}
1915		- sql+=" INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID WHERE 1=1" ;
	1915	+ 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 " ;
1916	1916	if (StringUtils.isNotEmpty(time))
1917	1917	{
1918	1918	String startTime = time.split(" - ")[0];
...	...	@@ -1949,7 +1949,7 @@
1949	1949	sql+=" UNION SELECT DISTINCT A.YCY_STSTEM_ID " +
1950	1950	" FROM ODS_D_HOSPITAL A " +
1951	1951	" INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO " +
1952		- " WHERE 1= 1 ";
	1952	+ " WHERE 1= 1 AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 ";
1953	1953	if (StringUtils.isNotEmpty(time))
1954	1954	{
1955	1955	String startTime = time.split(" - ")[0];