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 9e18f9b..f3e3cc6 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 @@ -492,9 +492,9 @@ public class AreaCountFacade { } sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID " + - " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ) A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start; + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ORDER BY AA.ISSUE_DATE,C.NAME DESC ) A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start; sqlCount+=" ) AA ON C.RECORD_ID=AA.RECORD_ID " + - " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"; + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ORDER BY AA.ISSUE_DATE,C.NAME DESC"; System.out.println("sql========="+sql); System.out.println("sqlCount===="+sql); @@ -827,7 +827,7 @@ public class AreaCountFacade { } } - sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"; + sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ORDER BY AA.ISSUE_DATE,C.NAME DESC"; System.out.println("sql===="+sql); List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); @@ -943,7 +943,7 @@ public class AreaCountFacade { result.put("name", map.get("NAME")); //姓名 result.put("checkWeek", map.get("YZ_NAME")); //产检孕周 result.put("examineHistoryNum", map.get("EXAMINE_HISTORY_NUM")); //产检第次 - result.put("ticketsType",map.get("TICKETS_ORDER")); //产检类型 + result.put("ticketsType",map.get("TICKETS_ORDER")); //产检券类型 result.put("ticketsNo", map.get("TICKETS_NO")); //产检券号 result.put("hospitalName",map.get("HOSPITAL_NAME")); //产检机构 result.put("doctorName",map.get("DOCTOR_NAME")); //产检医生 @@ -958,7 +958,7 @@ public class AreaCountFacade { cnames.put("name", "姓名"); //姓名 cnames.put("checkWeek","产检孕周"); //产检孕周 cnames.put("examineHistoryNum", "产检第次"); //产检第次 - cnames.put("ticketsType","产检类型"); //产检类型 + cnames.put("ticketsType","产检券类型"); //产检券类型 cnames.put("ticketsNo", "产检券号"); //产检券号 cnames.put("hospitalName","产检机构"); //产检机构 cnames.put("doctorName","产检医生"); //产检医生 @@ -1615,7 +1615,7 @@ public class AreaCountFacade { " CC.DOCTOR_NAME,\n" + " B.HOSPITAL_NAME AS JD_HOSPITAL,\n" + " B.TEL_NO\n" + - " FROM ODS_F_EXAMINE_HISTORY CC\n" + + " 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 ";