Commit dd210239332cf5e5fbb94f89c10d347fb33342e6
1 parent
85c4a7c7c9
Exists in
master
and in
1 other branch
code update
Showing 1 changed file with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
dd21023
... | ... | @@ -1085,7 +1085,7 @@ |
1085 | 1085 | "WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'"; |
1086 | 1086 | |
1087 | 1087 | |
1088 | - String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT A.EXAMINE_DATE,\n" + | |
1088 | + String sql = "SELECT * FROM ( SELECT A.EXAMINE_DATE,\n" + | |
1089 | 1089 | " A.NAME,\n" + |
1090 | 1090 | " A.AGE,\n" + |
1091 | 1091 | " A.NOW_WEEKS,\n" + |
... | ... | @@ -1116,6 +1116,7 @@ |
1116 | 1116 | " B.CITY_ID,\n" + |
1117 | 1117 | " B.CITY,\n" + |
1118 | 1118 | " B.PROVINCE_ID,\n" + |
1119 | + " B.PROVINCE,\n" + | |
1119 | 1120 | " B.PROVINCE\n" + |
1120 | 1121 | " FROM ODS_F_AUXILIARY_EXAMI A " + |
1121 | 1122 | " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID \n" + |
... | ... | @@ -1196,7 +1197,7 @@ |
1196 | 1197 | countSql += " AND A.DOCTOR_NO = "+doctorNo; |
1197 | 1198 | } |
1198 | 1199 | |
1199 | - sql+=" ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; | |
1200 | + sql+=" order by A.EXAMINE_DATE DESC,A.Name ASC ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; | |
1200 | 1201 | |
1201 | 1202 | // order by A.EXAMINE_DATE DESC" |
1202 | 1203 |