Commit 35f1cf248dc20aeeb69e027d9d2026ef1c925d05
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
35f1cf2
| ... | ... | @@ -26,6 +26,8 @@ |
| 26 | 26 | import com.lyms.platform.pojo.*; |
| 27 | 27 | import com.lyms.platform.query.*; |
| 28 | 28 | import org.apache.commons.collections.CollectionUtils; |
| 29 | +import org.slf4j.Logger; | |
| 30 | +import org.slf4j.LoggerFactory; | |
| 29 | 31 | import org.springframework.beans.factory.annotation.Autowired; |
| 30 | 32 | import org.springframework.data.domain.Sort; |
| 31 | 33 | import org.springframework.stereotype.Component; |
| ... | ... | @@ -42,6 +44,7 @@ |
| 42 | 44 | @Component |
| 43 | 45 | public class BookbuildingFacade { |
| 44 | 46 | |
| 47 | + private Logger logger = LoggerFactory.getLogger(BookbuildingFacade.class); | |
| 45 | 48 | public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); |
| 46 | 49 | |
| 47 | 50 | @Autowired |
| ... | ... | @@ -1114,10 +1117,10 @@ |
| 1114 | 1117 | " B.CITY,\n" + |
| 1115 | 1118 | " B.PROVINCE_ID,\n" + |
| 1116 | 1119 | " 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 +"'"; | |
| 1120 | + " FROM ODS_F_AUXILIARY_EXAMI A " + | |
| 1121 | + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID \n" + | |
| 1122 | + " INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2 \n" + | |
| 1123 | + " WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'"; | |
| 1121 | 1124 | if (StringUtils.isNotEmpty(exDateStart)) |
| 1122 | 1125 | { |
| 1123 | 1126 | sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')"; |
| ... | ... | @@ -1143,8 +1146,8 @@ |
| 1143 | 1146 | |
| 1144 | 1147 | if (weekEnds != null) |
| 1145 | 1148 | { |
| 1146 | - sql += " AND A.NOW_WEEKS>= "+weekEnds; | |
| 1147 | - countSql += " AND A.NOW_WEEKS>= "+weekEnds; | |
| 1149 | + sql += " AND A.NOW_WEEKS <= "+weekEnds; | |
| 1150 | + countSql += " AND A.NOW_WEEKS <= "+weekEnds; | |
| 1148 | 1151 | } |
| 1149 | 1152 | |
| 1150 | 1153 | if (StringUtils.isNotEmpty(hbsag)) |
| ... | ... | @@ -1192,7 +1195,11 @@ |
| 1192 | 1195 | sql += " AND A.DOCTOR_NO = "+doctorNo; |
| 1193 | 1196 | countSql += " AND A.DOCTOR_NO = "+doctorNo; |
| 1194 | 1197 | } |
| 1195 | - sql+=" ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; | |
| 1198 | + | |
| 1199 | + sql+=" order by A.EXAMINE_DATE DESC ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; | |
| 1200 | + | |
| 1201 | + System.out.print(sql); | |
| 1202 | + logger.info(sql); | |
| 1196 | 1203 | |
| 1197 | 1204 | |
| 1198 | 1205 | List<Map<String,Object>> list = JdbcUtil.getListDataBySql(sql); |