diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index e7ade6c..0681f8c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1114,10 +1114,10 @@ public class BookbuildingFacade { " B.CITY,\n" + " B.PROVINCE_ID,\n" + " B.PROVINCE\n" + - "FROM ODS_F_AUXILIARY_EXAMI A\n" + - "INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID\n" + - "INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2\n" + - "WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'"; + " FROM ODS_F_AUXILIARY_EXAMI A " + + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID \n" + + " INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2 \n" + + " WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'"; if (StringUtils.isNotEmpty(exDateStart)) { sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')"; @@ -1143,8 +1143,8 @@ public class BookbuildingFacade { if (weekEnds != null) { - sql += " AND A.NOW_WEEKS>= "+weekEnds; - countSql += " AND A.NOW_WEEKS>= "+weekEnds; + sql += " AND A.NOW_WEEKS <= "+weekEnds; + countSql += " AND A.NOW_WEEKS <= "+weekEnds; } if (StringUtils.isNotEmpty(hbsag)) @@ -1192,7 +1192,8 @@ public class BookbuildingFacade { sql += " AND A.DOCTOR_NO = "+doctorNo; countSql += " AND A.DOCTOR_NO = "+doctorNo; } - sql+=" ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; + + sql+=" order by A.EXAMINE_DATE ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; System.out.print(sql);