shiyang / regional-platform

Download as
Browse Code ยป

Commit 73886b89f605d7a4c0e993730dce212fd976d2d6

Authored by liquanyu
1 parent bc3ca147ee
Exists in master and in 1 other branch nobuildprocess

code update

Showing 1 changed file with 8 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 73886b8
... ... @@ -1114,10 +1114,10 @@
1114 1114 " B.CITY,\n" +
1115 1115 " B.PROVINCE_ID,\n" +
1116 1116 " B.PROVINCE\n" +
1117   - "FROM ODS_F_AUXILIARY_EXAMI A\n" +
1118   - "INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID\n" +
1119   - "INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2\n" +
1120   - "WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'";
  1117 + " FROM ODS_F_AUXILIARY_EXAMI A " +
  1118 + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID \n" +
  1119 + " INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2 \n" +
  1120 + " WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'";
1121 1121 if (StringUtils.isNotEmpty(exDateStart))
1122 1122 {
1123 1123 sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')";
... ... @@ -1143,8 +1143,8 @@
1143 1143  
1144 1144 if (weekEnds != null)
1145 1145 {
1146   - sql += " AND A.NOW_WEEKS>= "+weekEnds;
1147   - countSql += " AND A.NOW_WEEKS>= "+weekEnds;
  1146 + sql += " AND A.NOW_WEEKS <= "+weekEnds;
  1147 + countSql += " AND A.NOW_WEEKS <= "+weekEnds;
1148 1148 }
1149 1149  
1150 1150 if (StringUtils.isNotEmpty(hbsag))
... ... @@ -1192,7 +1192,8 @@
1192 1192 sql += " AND A.DOCTOR_NO = "+doctorNo;
1193 1193 countSql += " AND A.DOCTOR_NO = "+doctorNo;
1194 1194 }
1195   - sql+=" ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start;
  1195 +
  1196 + sql+=" order by A.EXAMINE_DATE ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start;
1196 1197  
1197 1198 System.out.print(sql);
1198 1199